From 96b2eca790b643710f5bdcb816a9bf3391232341 Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@os-k.eu>
Date: Thu, 27 Dec 2018 09:12:42 +0100
Subject: [PATCH] cleanup

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index d0d301c..dbcf818 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,7 @@
 
 Fully open-source operating system from scratch (WIP), released under the GNU GPL version 3.0
 
-<<<<<<< HEAD
 Branch boot : Development focused on the bootloader of OS/K
-=======
-Branch kaleid : Development focused on the Kaleid Kernel.
->>>>>>> kaleid
 
 For changelog, see src/ChangeLog.