From 1507944ff24d56be26277351a30cd85dd8885809 Mon Sep 17 00:00:00 2001 From: Mark Phillips Date: Fri, 6 Jan 2012 14:34:49 -0800 Subject: [PATCH] fixing conflicts --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ac09ca9..d597c28 100644 --- a/README.md +++ b/README.md @@ -23,4 +23,4 @@ This should be updated fairly regularly. As usual, **pull requests are encourage * [FreeBSD Handbook](http://www.freebsd.org/handbook/) - Clean and direct documentation of an OS. (contributed by [@mrtazz](https://twitter.com/#!/mrtazz)) * [Ruby on Rails Guides](http://guides.rubyonrails.org/) (contributed by [@seancribbs](https://twitter.com/#!/seancribbs)) * [Pow Annotated Source](http://pow.cx/docs/) - Built with [docco.](http://jashkenas.github.com/docco/) (contributed by [@BonzoESC](https://twitter.com/BonzoESC)) -* [Stripe Full API Documentation](https://stripe.com/docs/api) - Multiple languages, example code, good detail on the API (contributed by [@tnm](https://twitter.com/#!/tnm)) +* [Stripe Documentation](https://stripe.com/docs) and [Full API Documentation](https://stripe.com/docs/api) - Multiple languages, example code, good detail on the API; especially love how the API docs show examples for curl and their supported client libraries. (contributed simultaneously by [@tnm](https://twitter.com/#!/tnm) and [@technoweenie](https://twitter.com/#!/technoweenie)) \ No newline at end of file