Fixed Conflict

jarobins · jarobins · commit f531d34698ac · 2013-09-10T11:39:16.000-04:00
Some lines got added in from I assume the commits I hadn't yet updated
to. fixed it.
diff --git a/twitter.py b/twitter.py
@@ -4971,16 +4971,16 @@ def _RequestStream(self, url, verb, data=None):
        Returns:
          A twitter stream.
     '''
-<<<<<<< HEAD
+
     if verb == 'POST':
       return requests.post(url, data=data, stream=True,
                            auth=self.__auth)
-=======
+    
     if verb == 'POST':  return requests.post(url, data=data, stream=True,
                                              auth=self.__auth,
                                              timeout=self._requests_timeout
                                              )
->>>>>>> pr/8
+
     if verb == 'GET':
       url = self._BuildUrl(url, extra_params=data)
       return requests.get(url, stream=True, auth=self.__auth,
