Merge branch 'master' of https://gitea.wilderland.ovh/kyonshi/grenzland-mud

Merge branch 'grenzland'
Update README.md
2026-01-20 16:13:41 +01:00 · 2026-01-20 16:11:17 +01:00 · 2026-01-16 17:40:31 +01:00 · 2026-01-16 13:27:16 +01:00
1 changed files with 5 additions and 0 deletions
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 Files for Grenzland-MUD
+=======
+Files for grenzland-mud, forked from tbamud
+
+>>>>>>> e0083e3767413ead07a9ed02c041f25bc7da44ca

 Forked from tbamud
Author	SHA1	Message	Date
kyonshi	8fd4d5b234	Merge branch 'master' of https://gitea.wilderland.ovh/kyonshi/grenzland-mud Some checks failed C/C++ CI / build (push) Has been cancelled Details	2026-01-20 16:13:41 +01:00
kyonshi	5ac7427a6f	Merge branch 'grenzland'	2026-01-20 16:11:17 +01:00
kyonshi	e0083e3767	Update README.md Some checks failed C/C++ CI / build (push) Has been cancelled Details	2026-01-16 17:40:31 +01:00
kyonshi	c8e9cd8dc6	Update README.md Some checks failed C/C++ CI / build (push) Has been cancelled Details	2026-01-16 13:27:16 +01:00