From 6e92ac64f1a9de5a11f7d56da06cea7269e423bc Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@os-k.eu>
Date: Thu, 13 Feb 2020 13:44:53 +0100
Subject: [PATCH] Update with pci

---
 kaleid/kernel/init/init.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c
index 03810c5..b59cb25 100644
--- a/kaleid/kernel/init/init.c
+++ b/kaleid/kernel/init/init.c
@@ -38,11 +38,9 @@
 #include <io/pci.h>
 #include <po/shtdwn.h>
 #include <init/boot.h>
-<<<<<<< HEAD
 #include <io/pci.h>
 #include <drivers/rtl8139.h>
-=======
->>>>>>> master
+
 
 //
 // Entry point of the Kaleid kernel