Remove merge conflict lines from README (#1274)

README.md

@@ -79,13 +79,10 @@ Thanks to the following people who have submitted major pull requests:
 - [@cvkef](https://github.com/cvkef)
 
 Also, thanks to [Sauce Labs](http://saucelabs.com) for sponsoring the development of the responsive styles.
-<<<<<<< HEAD
-=======
 
 Special Thanks
 --------------------
 - [Middleman](https://github.com/middleman/middleman)
 - [middleman-syntax](https://github.com/middleman/middleman-syntax)
 - [middleman-gh-pages](https://github.com/edgecase/middleman-gh-pages)
 - [Font Awesome](http://fortawesome.github.io/Font-Awesome/)
->>>>>>> Update JavaScript dependencies (#1248)