one more change to merge to origin

[tt-rss.git] / classes / feeds.php

diff --git a/classes/feeds.php b/classes/feeds.php
index 409824f963cfc11f9de773de8cfd432f135120a4..b0447fd25fe9ff41dc606641e019b40cd68479c4 100644 (file)
--- 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')) {