1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b07b767..320a63e 100644
--- a/Makefile
+++ b/Makefile
@@ -102,11 +102,15 @@ 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: