diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-06-08 16:05:13 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-06-08 16:05:13 +0000 |
| commit | 017e329331e333a14d5d4192e376b8d0485d781c (patch) | |
| tree | b878cb0a03d02d90ea96eb410791f8f7d97a98c7 /Makefile | |
| parent | 078df91659ead3f811583202a9c34a1193da0520 (diff) | |
| download | alpine-iso-017e329331e333a14d5d4192e376b8d0485d781c.tar.bz2 alpine-iso-017e329331e333a14d5d4192e376b8d0485d781c.tar.xz | |
fix the previous merge
Diffstat (limited to 'Makefile')
| -rwxr-xr-x | Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -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 |