From a99532707bee766205347aac77bed992b55a0cb9 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Tue, 20 Dec 2016 12:52:24 -0500
Subject: [PATCH] Resolve conflict

---
 include/follow.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/follow.php b/include/follow.php
index 779ecf082d..f74655a9d2 100644
--- 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);
 		}
 	}