Previos merge from 2-0 did still contain a conflict marker

diff --git a/distrib/initscripts/Makefile.am b/distrib/initscripts/Makefile.am
index 76cf64278441bf650c911f94db0ccf733e4baeb6..e9e30a0bf9bc5951be7ad8f478c91be99d8b62a1 100644 (file)
--- a/distrib/initscripts/Makefile.am
+++ b/distrib/initscripts/Makefile.am
@@ -223,13 +223,8 @@ endif
 
 if USE_DEBIAN
 
-<<<<<<< Makefile.am
-sysvdir = /etc/init.d
-sysv_SCRIPTS = netatalk
-=======
 sysvdir = $(DESTDIR)$(sysconfdir)/init.d
-sysv_SCRIPTS = atalk
->>>>>>> 1.16.6.8.2.2
+sysv_SCRIPTS = netatalk
 
 netatalk: rc.atalk.debian
        cp -f rc.atalk.debian netatalk