diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-13 11:39:09 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-13 11:39:09 +0100 |
| commit | a89bba724bb4d9a16cccb804c21b541c7cfa0152 (patch) | |
| tree | bb03983a82c3884eeb5031cf28628d50203aab37 /addon/twitter | |
| parent | a2ee5ebe427522228dc03dc81da11f348a399c4d (diff) | |
| download | volse-hubzilla-a89bba724bb4d9a16cccb804c21b541c7cfa0152.tar.gz volse-hubzilla-a89bba724bb4d9a16cccb804c21b541c7cfa0152.tar.bz2 volse-hubzilla-a89bba724bb4d9a16cccb804c21b541c7cfa0152.zip | |
resolved some local git quirks
Diffstat (limited to 'addon/twitter')
| -rw-r--r-- | addon/twitter/twitter.php | 4 |
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']; |