fixed another left-over ...

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

diff --git a/include/text.php b/include/text.php
index 9d8ba260435ac266b88e0cd4f89678fff23ee855..f1bc5123269be18a4bfc628f368fda19975e893b 100644 (file)
--- 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;
        }