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

Conflicts:
	addon/twitter/twitter.php

diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index bb424fb653303e12e0dc69322a6d6a7df6a33ae0..93aca3129be63fe2081bd1709ae57d2e2615ce61 100644 (file)
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -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'];