Added POT file

git-svn-id: http://plugins.svn.wordpress.org/genesis-connect-for-woothemes-sensei/trunk@1272289 b8457f37-d9ea-0310-8a92-e5e31aec5664
christophherr · Oct 24, 2015 · c51d4e6 · c51d4e6
1 parent 5b406d4
commit c51d4e6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/readme.txt b/readme.txt
@@ -68,4 +68,8 @@ 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