fix merge conflicts

diff --git a/tweepy/auth.py b/tweepy/auth.py
index 2b0a77958d4b5133cb147fe4f90c0880d960c37d..b7b9a6e7c36ba66f90cb4873f950317349d30085 100644 (file)
--- a/tweepy/auth.py
+++ b/tweepy/auth.py
@@ -12,6 +12,7 @@ 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):