friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Resolve conflict

This commit is contained in:
Hypolite Petovan 2016-12-20 12:52:24 -05:00
parent e8e1f9253d
commit a99532707b
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/follow.php
View File

@ -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);
}
}