From a89bba724bb4d9a16cccb804c21b541c7cfa0152 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 13 Mar 2011 11:39:09 +0100 Subject: [PATCH] resolved some local git quirks --- addon/twitter/twitter.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php index 93aca3129b..c59d1b9e5c 100644 --- a/addon/twitter/twitter.php +++ b/addon/twitter/twitter.php @@ -138,11 +138,7 @@ function twitter_settings(&$a,&$s) { * which the user can request a PIN to connect the account to a * account at Twitter. */ -<<<<<<< HEAD require_once('library/twitteroauth.php'); -======= - require_once('library/twitteroauth.php'); ->>>>>>> a912a0d3cae0ae9c873dcb5c45624a725bd2c2d6 $connection = new TwitterOAuth($ckey, $csecret); $request_token = $connection->getRequestToken(); $token = $request_token['oauth_token'];