From 56215240039803389fb3c3e41604c50f6cb5c584 Mon Sep 17 00:00:00 2001
From: "@jehovahsays" <morgansbyers@gmail.com>
Date: Mon, 29 Apr 2024 16:48:22 -0400
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index 1abaa40..b7fd82e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 # root
 root directory
->>>>>>>+HEAD
 
 a web sroot core<br>
 a web server and php server<br> 
@@ -15,5 +14,4 @@ there is a language translator embeded on both command line pages<br>
 list directory is always located below the site map.<br>
 create a branch of root core repository and give example website of your creativity<br>
 
->>>>>>>-main
  dependencies preinstalled](https://github.com/jehovahsays/root/actions/workflows/jekyll-gh-pages.yml/badge.svg?branch=main)](https://github.com/jehovahsays/root/actions/workflows/jekyll-gh-pages.yml)