1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 647ba2c..76faf10 100755
--- a/Makefile
+++ b/Makefile
@@ -383,9 +383,7 @@ all-release: current previous $(profiles)
 			PROFILE=$$i release || break; \
 	done
 
-<<<<<<< HEAD
 edge:
 	@fakeroot $(MAKE) PROFILE=alpine-edge sha1
-=======
+
 .PRECIOUS: $(MODLOOP_KERNELSTAMP) $(MODLOOP_DIRSTAMP) $(INITFS_DIRSTAMP) $(INITFS) $(ISO_KERNEL_STAMP)
->>>>>>> sdrik/master