From: Roland Häder <roland@mxchange.org>
Date: Tue, 15 May 2018 21:25:30 +0000 (+0200)
Subject: fixed another left-over ...
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1567eb0791d61b5718d30ecc84e249347d71b1dc;p=friendica.git

fixed another left-over ...

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/include/text.php b/include/text.php
index 9d8ba26043..f1bc512326 100644
--- a/include/text.php
+++ b/include/text.php
@@ -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;
 	}