From 32af479a77372ce14b81ee1696a1d71a337549cc Mon Sep 17 00:00:00 2001
From: crims0n <crims0n@yandex.ru>
Date: Thu, 2 Dec 2021 17:57:04 +0000
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index 61cff8a..2ff2aae 100644
--- a/README.md
+++ b/README.md
@@ -37,11 +37,6 @@
 
 `docker run --rm -it --name mlc --privileged -v /home/user/build:/build local/mlc /build/minios-slax/install -`
 
-<<<<<<< HEAD
-=======
-# MiniOS
-
->>>>>>> 87824b6859e2e1b685e34e17647b16d4ad378c96
 These scripts build a bootable MiniOS ISO image.
 
 For installation use **install** - script for guided installation, **autoinstall** - script for automatic installation.