Merge branch 'main' of git@github.com:jehovahsays/root.git

jehovahsays · Apr 29, 2024 · cc916f9 · cc916f9
2 parents e4d2b9f + 5621524
commit cc916f9
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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)