From 168f5d7c0b3b2b543ece04ccf09616c8a6b302b2 Mon Sep 17 00:00:00 2001
From: Dimitar Petrovski <dimeptr@gmail.com>
Date: Mon, 29 Oct 2012 11:38:01 +0100
Subject: error in merge

---
 eepg.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eepg.c b/eepg.c
index 5bcd1d4..370c848 100644
--- a/eepg.c
+++ b/eepg.c
@@ -1299,7 +1299,6 @@ void cFilterEEPG::WriteToSchedule(tChannelID channelID, cSchedules* pSchedules,
 
     char* tmp = NULL;
     string shText;
-    string shText;
     if (SummText && ShTxtLen) {
     
       shText.assign(SummText,ShTxtLen);
-- 
cgit v1.2.3