clean up git

git-svn-id: http://plugins.svn.wordpress.org/genesis-connect-for-woothemes-sensei/tags/1.0.3@1294645 b8457f37-d9ea-0310-8a92-e5e31aec5664

readme.txt

@@ -5,7 +5,11 @@ Donate link: https://www.christophherr.com/donate/
 Tags: woothemes sensei, woothemes, genesis, genesis connect, studiopress
 Requires at least: 4.1
 Tested up to: 4.3
+<<<<<<< HEAD
 Stable tag: 1.0.3
+=======
+Stable tag: 1.0.1
+>>>>>>> clean up git
 License: GPL-2.0+
 License URI: http://www.gnu.org/licenses/gpl-2.0.txt
 
@@ -52,6 +56,7 @@ There are no settings and no settings screen. You would have to change the code
 
 == Changelog ==
 
+<<<<<<< HEAD
 = 1.0.3 =
 
 * Corrected oversight in original code. First closing tag should be `</main>` instead of `</div>`
@@ -61,6 +66,8 @@ see: http://cobaltapps.com/forum/forum/main-category/main-forum/81542-woo-sensei
 
 * POT file added
 
+=======
+>>>>>>> clean up git
 = 1.0.1 =
 
 * Loading textdomain for i18n
@@ -71,6 +78,7 @@ see: http://cobaltapps.com/forum/forum/main-category/main-forum/81542-woo-sensei
 
 == Upgrade Notice ==
 
+<<<<<<< HEAD
 = 1.0.3 =
 
 This version corrects an oversight in the original code
@@ -83,3 +91,8 @@ This version adds a POT file for translations.
 = 1.0.1 =
 
 This version loads the textdomain to enable translations.
+=======
+= 1.0.1 =
+
+This version loads the textdomain to enable translations
+>>>>>>> clean up git