Permalink
Browse files

Bugfix: remove old diff marker

  • Loading branch information...
1 parent 2b04114 commit 307068ca6949d781e328e8c705b4b1d3aab47a66 @macintux macintux committed Feb 18, 2013
Showing with 0 additions and 1 deletion.
  1. +0 −1 README.md
View
@@ -58,7 +58,6 @@ This should be updated fairly regularly. As usual, **pull requests are encourage
* [Ember.js](http://emberjs.com/documentation/) - The overall navigation could be done a bit better but the presentation and readability is quite nice. (contributed by [@cmeik](https://twitter.com/cmeik))
* [DotCloud Platform Docs](http://docs.dotcloud.com/firststeps/platform-overview/) - Responsive, focused, simple, and all-around useable.
* [Mashape API Docs](https://www.mashape.com/japerk/text-processing) - Clean auto-generated documentations for APIs
-<<<<<<< HEAD
* [Basho Docs](http://docs.basho.com/) - Well-designed, excellent use of versioning, integrated search, and much more.
* [spray.io Docs](http://spray.io) - Well-structured, clean, responsive, comprehensive. Bootstrap-based design.
* [Go By Example](http://gobyexample.com) - Clean, simple, and extensive. These docs that make you want to learn Go just because they make it so straightforward.

0 comments on commit 307068c

Please sign in to comment.