diff options
| author | Dimitar Petrovski <dimeptr@gmail.com> | 2011-10-27 22:06:04 +0200 |
|---|---|---|
| committer | Dimitar Petrovski <dimeptr@gmail.com> | 2011-10-27 22:06:04 +0200 |
| commit | 7ae1e640e55eea7d0d8d18ef49fe71389a05f1df (patch) | |
| tree | 7eaeb95661d940ecf588d6e3da014e41f0d4609d | |
| parent | 27bb478bb63ca513ab692b49e686cfc71cfbf31e (diff) | |
| download | vdr-plugin-eepg-7ae1e640e55eea7d0d8d18ef49fe71389a05f1df.tar.gz vdr-plugin-eepg-7ae1e640e55eea7d0d8d18ef49fe71389a05f1df.tar.bz2 | |
resolve conflicts
| -rw-r--r-- | eepg.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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! |