Browse files

Fixed readme.md

  • Loading branch information...
1 parent 041b3a6 commit b1b2bf66ef9652e60a52f2fb1f2124021ee6d545 @tmort committed May 19, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 README.md
View
3 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
+

0 comments on commit b1b2bf6

Please sign in to comment.