fix merge conflicts
authorOmer Murat Yildirim <omermuratyildirim@gmail.com>
Tue, 23 Sep 2014 17:00:23 +0000 (20:00 +0300)
committerOmer Murat Yildirim <omermuratyildirim@gmail.com>
Tue, 23 Sep 2014 17:00:23 +0000 (20:00 +0300)
tweepy/auth.py

index b7b9a6e7c36ba66f90cb4873f950317349d30085..2b0a77958d4b5133cb147fe4f90c0880d960c37d 100644 (file)
@@ -12,7 +12,6 @@ and access_type don't always play nice together. Details
 https://dev.twitter.com/discussions/21281"""
 
 
-
 class AuthHandler(object):
 
     def apply_auth(self, url, method, headers, parameters):