diff options
| author | Dimitar Petrovski <dimeptr@gmail.com> | 2014-04-14 09:58:04 +0200 |
|---|---|---|
| committer | Dimitar Petrovski <dimeptr@gmail.com> | 2014-04-14 09:58:04 +0200 |
| commit | 0223b8b98276b3f1c935325c9dcdf9b6484eb136 (patch) | |
| tree | eb14b0d3de1bacf3a300e508e15781b51810a82a | |
| parent | 970976d2758c659dc41ffabf9bc9b160c8fbc29b (diff) | |
| download | vdr-plugin-eepg-0223b8b98276b3f1c935325c9dcdf9b6484eb136.tar.gz vdr-plugin-eepg-0223b8b98276b3f1c935325c9dcdf9b6484eb136.tar.bz2 | |
fix wrong merge conflicts
| -rw-r--r-- | Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -102,15 +102,11 @@ OBJS = $(PLUGIN).o dish.o epghandler.o setupeepg.o equivhandler.o util.o eit2.o ### The main target: -<<<<<<< HEAD ifdef API1733 all: libvdr-$(PLUGIN).so i18n else all: $(SOFILE) i18n endif -======= -all: $(SOFILE) ->>>>>>> master ### Implicit rules: |