From: Roland Häder <roland@mxchange.org>
Date: Thu, 26 Jan 2017 14:23:30 +0000 (+0100)
Subject: added spaces + some curly braces + some usage of dbm::is_result()
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=09384119b173021effdc5f568da316bff4560a45;p=friendica.git

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 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;
 	}