From 1e2bf99bd46d9bdc35c9e0d774e2456847eca78c Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@os-k.eu>
Date: Mon, 11 Mar 2019 14:16:56 +0100
Subject: [PATCH] merge

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 37b89cd..64e4a70 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,6 @@ test: kaleid
 	@ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 32 > loader_disasm32.asm
 
 
-<<<<<<< HEAD
 test32: kernel loader
 	qemu-system-i386 -hda build/bin/disk.img -d cpu_reset,guest_errors,pcall,int -enable-kvm 2> qemu.log &
 	@ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 64 > loader_disasm64.asm