aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-03-16 07:30:08 +0100
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-03-16 07:30:08 +0100
commit0c16d033efd4ee878ab94318e7980d373ad3994d (patch)
treebb50ffa9c8e546465f46b7a838c9c31bb484deb3
parentc43f647049c78b594c90e95d06d12f29f300d5d3 (diff)
parenta89bba724bb4d9a16cccb804c21b541c7cfa0152 (diff)
downloadvolse-hubzilla-0c16d033efd4ee878ab94318e7980d373ad3994d.tar.gz
volse-hubzilla-0c16d033efd4ee878ab94318e7980d373ad3994d.tar.bz2
volse-hubzilla-0c16d033efd4ee878ab94318e7980d373ad3994d.zip
Merge github.com:tobiasd/friendika
-rw-r--r--addon/twitter/twitter.php4
1 files changed, 0 insertions, 4 deletions
diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index 93aca3129..c59d1b9e5 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'];