From: Omer Murat Yildirim <omermuratyildirim@gmail.com>
Date: Tue, 23 Sep 2014 16:59:17 +0000 (+0300)
Subject: fix merge conflicts
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=725bc3b56e0964fe4c557bc8e5692d0a32733231;p=tweepy.git

fix merge conflicts
---

diff --git a/tweepy/auth.py b/tweepy/auth.py
index 2b0a779..b7b9a6e 100644
--- 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):