friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

resolved some local git quirks

This commit is contained in:
Tobias Diekershoff 2011-03-13 11:39:09 +01:00
parent a2ee5ebe42
commit a89bba724b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addon/twitter/twitter.php
View File

@ -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'];