Fixed issues after merge of #1

Signed-off-by: JohnVictoryz <[email protected]>
Soviet-Linux · Feb 27, 2024 · b1e0fc2 · b1e0fc2
1 parent 965359e
commit b1e0fc2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -10,10 +10,6 @@ This is the home of the official Soviet-Linux Docs
 2. Clone your fork
 3. Install requirements.txt using pip
 4. Run `mkdocs serve`
-<<<<<<< HEAD
 5. Make your changes
-=======
-5. Make your changes 
->>>>>>> main
 6. Stage and commit
 7. Open PR
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -50,12 +50,6 @@ extra:
     - icon: fontawesome/brands/discord
       link: https://discord.gg/P95xPM9KZY
       name: Soviet-Linux Discord Server
-<<<<<<< HEAD
 copyright: This is under the GPL-3.0 license.
 repo_url: https://github.com/Soviet-Linux/Soviet-Docs/
 repo_name: Soviet Docs
-=======
-copyright: This is licensed under the GPL-3.0 license.
-repo_url: https://github.com/Soviet-Linux/
-repo_name: Soviet Linux
->>>>>>> main