diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2015-07-19 09:19:58 +0400 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2015-07-19 09:19:58 +0400 |
| commit | 37e7a5d80b88d29ae1b76fc6efc9f0b819c18c02 (patch) | |
| tree | f8b82f4ed1e2eb441f66d9c248b2d87b46fafc0f /bootloader/Makefile | |
| parent | cef56790ea642c4308e34c280508fdcc63a313f0 (diff) | |
| parent | a49a53e48af9bdf64fee43c3772cb654ceb8e6ab (diff) | |
Solve conflicts
Diffstat (limited to 'bootloader/Makefile')
| -rw-r--r-- | bootloader/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bootloader/Makefile b/bootloader/Makefile index 9cb2ec5..7fb8173 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile @@ -1,8 +1,7 @@ - bootloader.bin: bootloader.asm - nasm -f bin -o $@ $^ + nasm -f bin -o $@ $< clean: rm bootloader.bin |