prosody
32122251d2fe

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

525:32122251d2fe

Remove stray merge marker
author Matthew Wild <mwild1@gmail.com>
date Wed, 03 Dec 2008 16:01:58 +0000
parents 524:3f9f67f1a106
children 526:b1d90f7d074a
files prosody.cfg.lua.dist
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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