moving stuff around

This commit is contained in:
2026-01-22 12:23:29 +01:00
parent 8fd4d5b234
commit 9b9bb8eab5
2 changed files with 4 additions and 8 deletions

4
.gitignore vendored
View File

@@ -63,6 +63,10 @@ lib/plrobjs/index
!lib/plrobjs/U-Z/00 !lib/plrobjs/U-Z/00
!lib/plrobjs/ZZZ/00 !lib/plrobjs/ZZZ/00
#don't commit logs
!log/*
!syslog.CRASH
# also not autogenerated config file # also not autogenerated config file
/lib/etc/config /lib/etc/config
# or the list of last logins # or the list of last logins

View File

@@ -1,8 +0,0 @@
<<<<<<< HEAD
Files for Grenzland-MUD
=======
Files for grenzland-mud, forked from tbamud
>>>>>>> e0083e3767413ead07a9ed02c041f25bc7da44ca
Forked from tbamud