From b1844be82d922e3ba6d601119503af142a453647 Mon Sep 17 00:00:00 2001
From: kyonshi <kyonshi@wilderland.ovh>
Date: Tue, 20 Jan 2026 16:14:59 +0100
Subject: [PATCH] Update README.md

---
 README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 263db4b..dc79437 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
+
 Files for Grenzland-MUD
 =======
 Files for grenzland-mud, forked from tbamud
 
->>>>>>> e0083e3767413ead07a9ed02c041f25bc7da44ca
-
-Forked from tbamud