1 files changed, 3 insertions, 4 deletions

diff --git a/eepg.c b/eepg.c
index 87d50a5..ce44960 100644
--- a/eepg.c
+++ b/eepg.c
@@ -3306,9 +3306,8 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
              , DishEventDescriptor->getStarRating()
              , DishEventDescriptor->getProgramId()
              , DishEventDescriptor->getSeriesId()
-<<<<<<< .mine             , orgAirDate == 0 ? "" : asctime(localtime(&orgAirDate)));
-=======             , orgAirDate == 0 ? "" : asctime(localtime(&orgAirDate)) (&orgAirDate));
->>>>>>> .theirs         pEvent->SetDescription(tmp);
+             , orgAirDate == 0 ? "" : asctime(localtime(&orgAirDate)));
+         pEvent->SetDescription(tmp);
          free(tmp);
 
 
@@ -4374,4 +4373,4 @@ bool cPluginEEPG::SetupParse (const char *Name, const char *Value)
   return true;
 }
 
-VDRPLUGINCREATOR (cPluginEEPG); // Don't touch this!
\ No newline at end of file
+VDRPLUGINCREATOR (cPluginEEPG); // Don't touch this!