diff options
| -rw-r--r-- | addon/twitter/twitter.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php index bb424fb65..93aca3129 100644 --- a/addon/twitter/twitter.php +++ b/addon/twitter/twitter.php @@ -138,7 +138,11 @@ 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']; |