From 09384119b173021effdc5f568da316bff4560a45 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 15:23:30 +0100
Subject: [PATCH] added spaces + some curly braces + some usage of
 dbm::is_result()
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/text.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/include/text.php b/include/text.php
index 6a11a8b372..b7f7b5abb1 100644
--- 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;
 	}
-- 
2.39.5