From 852ef4021b30c56185818971e17a50eec0a7a5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 16:07:30 +0100
Subject: [PATCH] more spaces + some curly spaces added
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/include/text.php b/include/text.php
index f1bc512326..9d8ba26043 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1883,8 +1883,15 @@ 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;
 	}