Wed, 03 Dec 2008 16:01:58 +0000
Remove stray merge marker
--- a/prosody.cfg.lua.dist Wed Dec 03 15:09:58 2008 +0000 +++ b/prosody.cfg.lua.dist Wed Dec 03 16:01:58 2008 +0000 @@ -75,4 +75,3 @@ } enabled = false -- This will disable the host, preserving the config, but denying connections ->>>>>>> other