one more change to merge to origin

11 years ago · 2e18843845
parent 0708046b4f
commit 2e18843845
1 changed files with 2 additions and 6 deletions
--- a/classes/feeds.php
+++ b/classes/feeds.php
@ -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')) {