From f3c1bc51eaeba0f15220c317704e37245abf36c4 Mon Sep 17 00:00:00 2001
From: gugulethu <gugulethu@noreply.codeberg.org>
Date: Fri, 20 Jun 2025 18:32:03 +0200
Subject: [PATCH] Fix merge marks

---
 mkdocs.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 731e8cf..8277b0f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -149,13 +149,6 @@ theme:
     - search.highlight # Highlight the search item in the page.
     - search.suggest # Suggest search results.
     - search.share # Deep-link to a search results page.
-<<<<<<< HEAD
-=======
-  # font:
-  #   text: Libre Baskerville
-  #   code: DM Mono
->>>>>>> 86b6f0a (Use gh pages.)
-  # Icons to use for different tags and the repo.
   font: false
   icon:
     annotation: material/plus-circle-outline