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 14379f6ff87419c4e0687c8013784f7c5919d431..c9ab0b94305a8fc2e02d698e11e5be1045459a7e 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -1919,15 +1919,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;
        }