From: Kenneth Reitz <me@kennethreitz.com>
Date: Sun, 8 Jul 2012 04:23:36 +0000 (-0400)
Subject: merge conflict
X-Git-Tag: v0.13.3~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3347146a441d47defaa4a1fe40337b68496c6bb7;p=services%2Fpython-requests.git

merge conflict
---

3347146a441d47defaa4a1fe40337b68496c6bb7
diff --cc README.rst
index 43281e9,b2572fe..2a9208c
--- a/README.rst
+++ b/README.rst
@@@ -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.