From c2509a4bb0fe34cb5dcd481189f737ba6ea81dbc Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@os-k.eu>
Date: Fri, 29 Mar 2019 14:23:36 +0100
Subject: [PATCH] update

---
 ProjectTree | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/ProjectTree b/ProjectTree
index 70ad193..5c54708 100644
--- a/ProjectTree
+++ b/ProjectTree
@@ -124,11 +124,8 @@
 │   │   │   ├── cpu.h
 │   │   │   ├── heap.h
 │   │   │   ├── iomisc.h
-<<<<<<< Updated upstream
-│   │   │   ├── mboot.h
-=======
 │   │   │   ├── log.h
->>>>>>> Stashed changes
+│   │   │   ├── mboot.h
 │   │   │   ├── mm.h
 │   │   │   ├── panic.h
 │   │   │   ├── proc.h
@@ -168,12 +165,10 @@
 ├── grub.log
 ├── kaleid32_disasm.asm
 ├── kaleid64_disasm.asm
-├── loader_disasm32.asm
-├── loader_disasm64.asm
 ├── Makefile
 ├── memdump.bin
 ├── ProjectTree
 ├── qemu.log
 └── Readme.md
 
-28 directories, 120 files
+28 directories, 118 files