added spaces + some curly braces + some usage of dbm::is_result()

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

diff --git a/include/text.php b/include/text.php
index 6a11a8b372ed2f5367dc11479a089fb004cedb42..b7f7b5abb13e377b1f686d2f58b94c044057d95c 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -1918,15 +1918,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;
        }