@@ -1,8 +1,5 @@
<<<<<<< HEAD
Files for Grenzland-MUD
=======
Files for grenzland-mud, forked from tbamud
>>>>>>> e0083e3767413ead07a9ed02c041f25bc7da44ca
Forked from tbamud
The note is not visible to the blocked user.