Mercurial > lxmppd-hg-xmllex / changeset

• changeset
• raw
• zip
• gz

changeset

Remove stray merge marker

Wed, 03 Dec 2008 16:01:58 +0000

author

Matthew Wild <mwild1@gmail.com>

date

Wed, 03 Dec 2008 16:01:58 +0000

changeset 525

32122251d2fe

parent 524

3f9f67f1a106

child 526

b1d90f7d074a

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