From 307068ca6949d781e328e8c705b4b1d3aab47a66 Mon Sep 17 00:00:00 2001 From: "John R. Daily" Date: Mon, 18 Feb 2013 11:29:50 -0600 Subject: [PATCH] Bugfix: remove old diff marker --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index e0c88e1..4af1f50 100644 --- a/README.md +++ b/README.md @@ -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.