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

fix merge conflicts
---

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