mirror of
https://github.com/friendica/friendica
synced 2024-12-22 06:07:27 +01:00
resolved some local git quirks
This commit is contained in:
parent
a2ee5ebe42
commit
a89bba724b
1 changed files with 0 additions and 4 deletions
|
@ -138,11 +138,7 @@ function twitter_settings(&$a,&$s) {
|
||||||
* which the user can request a PIN to connect the account to a
|
* which the user can request a PIN to connect the account to a
|
||||||
* account at Twitter.
|
* account at Twitter.
|
||||||
*/
|
*/
|
||||||
<<<<<<< HEAD
|
|
||||||
require_once('library/twitteroauth.php');
|
require_once('library/twitteroauth.php');
|
||||||
=======
|
|
||||||
require_once('library/twitteroauth.php');
|
|
||||||
>>>>>>> a912a0d3cae0ae9c873dcb5c45624a725bd2c2d6
|
|
||||||
$connection = new TwitterOAuth($ckey, $csecret);
|
$connection = new TwitterOAuth($ckey, $csecret);
|
||||||
$request_token = $connection->getRequestToken();
|
$request_token = $connection->getRequestToken();
|
||||||
$token = $request_token['oauth_token'];
|
$token = $request_token['oauth_token'];
|
||||||
|
|
Loading…
Reference in a new issue