From 017e329331e333a14d5d4192e376b8d0485d781c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 8 Jun 2010 16:05:13 +0000 Subject: fix the previous merge --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.3