merge conflict
authorKenneth Reitz <me@kennethreitz.com>
Sun, 8 Jul 2012 04:23:36 +0000 (00:23 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 8 Jul 2012 04:23:36 +0000 (00:23 -0400)
1  2 
README.rst

diff --cc README.rst
index 43281e9338a0a766eca3f58c672ef92d8a164702,b2572feb282993bb42327d26c030145321024fe0..2a9208cc50851386c6d217688374b7362439314c
@@@ -2,8 -2,8 +2,8 @@@ Requests: HTTP for Human
  =========================
  
  
- .. image:: https://secure.travis-ci.org/kennethreitz/requests.png?branch=master
-               :target: https://secure.travis-ci.org/kennethreitz/requests
+ .. image:: https://secure.travis-ci.org/kennethreitz/requests.png?branch=develop
 -              :target: https://secure.travis-ci.org/kennethreitz/requests
++        :target: https://secure.travis-ci.org/kennethreitz/requests
  
  Requests is an ISC Licensed HTTP library, written in Python, for human
  beings.