Resolve conflict

diff --git a/include/follow.php b/include/follow.php
index 779ecf082dea4f1c765117cbb4acde80fce3b068..f74655a9d287e4cf1dff5ebda52fed591398119e 100644 (file)
--- a/include/follow.php
+++ b/include/follow.php
@@ -289,14 +289,9 @@ function new_contact($uid,$url,$interactive = false) {
                        $slap = ostatus::salmon($item, $r[0]);
                        slapper($r[0], $contact['notify'], $slap);
                }
-<<<<<<< HEAD
-               if($contact['network'] == NETWORK_DIASPORA) {
-                       require_once('include/diaspora.php');
-                       $ret = Diaspora::send_share($a->user,$contact);
-=======
+
                if ($contact['network'] == NETWORK_DIASPORA) {
-                       $ret = diaspora::send_share($a->user,$contact);
->>>>>>> friendica/develop
+                       $ret = Diaspora::send_share($a->user,$contact);
                        logger('share returns: '.$ret);
                }
        }