From 2e188438456314d4cffab67c6a0baddb0b364b05 Mon Sep 17 00:00:00 2001
From: justauser <justausr@hotmail.com>
Date: Thu, 27 Jun 2013 12:21:14 -0400
Subject: [PATCH] one more change to merge to origin

---
 classes/feeds.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/classes/feeds.php b/classes/feeds.php
index 409824f96..b0447fd25 100644
--- 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')) {