clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed another left-over ... 

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2018-05-15 23:25:30 +02:00
parent a5dba628c4
commit 1567eb0791
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/text.php
View File

@ -1883,15 +1883,8 @@ function file_tag_save_file($uid, $item, $file)
return true;
}
<<<<<<< HEAD
function file_tag_unsave_file($uid, $item, $file, $cat = false)
{
=======
function file_tag_unsave_file($uid, $item, $file, $cat = false) {
require_once "include/files.php";
$result = false;
>>>>>>> more spaces + some curly spaces added
if (! intval($uid)) {
return false;
}