# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1228320118 0
# Node ID 32122251d2feed959f611a3c61cbcdac6daee0ac
# Parent  3f9f67f1a106267fbeb4a26e2dda81c16f2adeaf
Remove stray merge marker

diff -r 3f9f67f1a106 -r 32122251d2fe prosody.cfg.lua.dist
--- 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