From a1c86523a020a31ab05e1fd1c8f574c792438c6b Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Tue, 18 Nov 2025 09:46:48 +0200
Subject: Update content for md

---
 index.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'index.md')

diff --git a/index.md b/index.md
index 50e39e0b..8c11e844 100644
--- a/index.md
+++ b/index.md
@@ -1,10 +1,6 @@
 # Hello!
 
-<<<<<<< HEAD
-> This site was generated at 2025-11-18T09:41:06+02:00 by `Gemtexter`
-=======
-> This site was generated at 2025-11-09T12:53:07+02:00 by `Gemtexter`
->>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
+> This site was generated at 2025-11-18T09:45:23+02:00 by `Gemtexter`
 
 Welcome to the foo.zone!
 
-- 
cgit v1.2.3