clean up git

git-svn-id: http://plugins.svn.wordpress.org/genesis-connect-for-woothemes-sensei/trunk@1272290 b8457f37-d9ea-0310-8a92-e5e31aec5664
christophherr · Oct 24, 2015 · a592c76 · a592c76
1 parent c51d4e6
commit a592c76
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/readme.txt b/readme.txt
@@ -68,8 +68,4 @@ This version adds a POT file for translations.
 
 = 1.0.1 =
 
-<<<<<<< HEAD
 This version loads the textdomain to enable translations.
-=======
-This version loads the textdomain to enable translations.
->>>>>>> Added POT file