valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

one more change to merge to origin

This commit is contained in:
justauser 2013-06-27 12:21:14 -04:00
parent 0708046b4f
commit 2e18843845
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/feeds.php
View File

@ -580,12 +580,8 @@ class Feeds extends Handler_Protected {
else
$excerpt_hidden = "style=\"display : none\"";
$reply['content'] .= "<span $excerpt_hidden
<<<<<<< HEAD
id=\"CEXC-$id\" class=\"cdmExcerpt\"> -" . $content_preview . "</span>";
=======
id=\"CEXC-$id\" class=\"cdmExcerpt\">$content_preview</span>";
>>>>>>> origin
$reply['content'] .= "<span $excerpt_hidden id=\"CEXC-$id\" class=\"cdmExcerpt\">$content_preview</span>";
$reply['content'] .= "</span>";
if (!get_pref('VFEED_GROUP_BY_FEED')) {