From 725bc3b56e0964fe4c557bc8e5692d0a32733231 Mon Sep 17 00:00:00 2001 From: Omer Murat Yildirim Date: Tue, 23 Sep 2014 19:59:17 +0300 Subject: [PATCH] fix merge conflicts --- tweepy/auth.py | 1 + 1 file changed, 1 insertion(+) 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): -- 2.25.1