Update with pci

2020-02-13 13:44:53 +01:00 · 2020-02-13 13:44:53 +01:00 · 6e92ac64f1
parent b21c07a8e2
commit 6e92ac64f1
1 changed files with 1 additions and 3 deletions
--- 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