From 87ecde5c2f05b509cbee577475870e1c74011642 Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@os-k.eu>
Date: Mon, 18 Mar 2019 20:53:09 +0100
Subject: [PATCH] oops

---
 Makefile | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 7f81e2c..ce5cace 100644
--- a/Makefile
+++ b/Makefile
@@ -124,18 +124,11 @@ $(KOBJDIR)/prog.o: $(KERNELDIR)/extras/prog.c
 	@echo ${CL2}[$@] ${CL}Compiled.${CL3}
 
 # Kernel objects
-<<<<<<< HEAD
 kal_kern_obj= $(KOBJDIR)/kernel/cpuid.o $(KOBJDIR)/kernel/init.o    \
 	  $(KOBJDIR)/kernel/table.o $(KOBJDIR)/kernel/cursor.o          \
 	  $(KOBJDIR)/kernel/term.o $(KOBJDIR)/kernel/vga.o              \
 	  $(KOBJDIR)/kernel/panic.o $(KOBJDIR)/kernel/map.o             \
-=======
-kal_kern_obj= $(KOBJDIR)/kernel/cpuid.o $(KOBJDIR)/kernel/init.o  \
-	  $(KOBJDIR)/kernel/table.o $(KOBJDIR)/kernel/cursor.o    \
-	  $(KOBJDIR)/kernel/term.o $(KOBJDIR)/kernel/vga.o        \
-	  $(KOBJDIR)/kernel/panic.o $(KOBJDIR)/kernel/heap.o      \
-	  $(KOBJDIR)/kernel/malloc.o
->>>>>>> BetterTerm
+	  $(KOBJDIR)/kernel/heap.o  $(KOBJDIR)/kernel/malloc.o
 
 $(KOBJDIR)/kernel/cpuid.o: $(KERNELDIR)/kernel/cpu/cpuid.c
 	@$(KCC) $< -o $@
@@ -158,14 +151,13 @@ $(KOBJDIR)/kernel/vga.o: $(KERNELDIR)/kernel/io/vga.c
 $(KOBJDIR)/kernel/panic.o: $(KERNELDIR)/kernel/ke/panic.c
 	@$(KCC) $< -o $@
 	@echo ${CL2}[$@] ${CL}Compiled.${CL3}
-<<<<<<< HEAD
 $(KOBJDIR)/kernel/map.o: $(KERNELDIR)/kernel/mm/map.c
-=======
+	@$(KCC) $< -o $@
+	@echo ${CL2}[$@] ${CL}Compiled.${CL3}
 $(KOBJDIR)/kernel/heap.o: $(KERNELDIR)/kernel/mm/heap.c
 	@$(KCC) $< -o $@
 	@echo ${CL2}[$@] ${CL}Compiled.${CL3}
 $(KOBJDIR)/kernel/malloc.o: $(KERNELDIR)/kernel/mm/malloc.c
->>>>>>> BetterTerm
 	@$(KCC) $< -o $@
 	@echo ${CL2}[$@] ${CL}Compiled.${CL3}