https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a5dba62
)
fixed another left-over ...
author
Roland Häder
<roland@mxchange.org>
Tue, 15 May 2018 21:25:30 +0000
(23:25 +0200)
committer
Roland Häder
<roland@mxchange.org>
Wed, 20 Jun 2018 20:02:16 +0000
(22:02 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
include/text.php
patch
|
blob
|
history
diff --git
a/include/text.php
b/include/text.php
index
9d8ba26
..
f1bc512
100644
(file)
--- a/
include/text.php
+++ b/
include/text.php
@@
-1883,15
+1883,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;
}