From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 13 Mar 2011 10:37:24 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a2ee5ebe427522228dc03dc81da11f348a399c4d;p=friendica.git

Merge branch 'master' of git://github.com/friendika/friendika

Conflicts:
	addon/twitter/twitter.php
---

a2ee5ebe427522228dc03dc81da11f348a399c4d
diff --cc addon/twitter/twitter.php
index 678da9388a,bb424fb653..93aca3129b
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@@ -138,7 -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'];