Fixed readme.md

tmort · May 19, 2012 · b1b2bf6 · b1b2bf6
1 parent 041b3a6
commit b1b2bf6
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # WPSocialite
 
 This plugin adds the SocialiteJS Functionailty (Developed by David Bushell[http://dbushell.com/]) to Wordpress. 
@@ -77,4 +76,4 @@ Be kind! Provide an element to search within using `context` rather than the who
 	Socialite.extend('network', function);
 
 With `extend` you can add more social networks! The `function` is called by `Socialite.load` and `Socialite.activate` to replace the default element with the shiny sharing button. 
->>>>>>> conflictissue
+