From 0368e0d59943885553f31ad1f40cbb8ba4f2a11c Mon Sep 17 00:00:00 2001
From: Omer Murat Yildirim <omermuratyildirim@gmail.com>
Date: Tue, 23 Sep 2014 20:00:23 +0300
Subject: [PATCH] fix merge conflicts

---
 tweepy/auth.py | 1 -
 1 file changed, 1 deletion(-)

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):
-- 
2.25.1