From b70b5a847d3756582102a0f1f66040c4824825ca Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 3 Dec 2008 16:01:58 +0000
Subject: Remove stray merge marker

---
 prosody.cfg.lua.dist | 1 -
 1 file changed, 1 deletion(-)

(limited to 'prosody.cfg.lua.dist')

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 5a0fab71..7289921a 100644
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -75,4 +75,3 @@ Host "example.com"
 		}
 
 	enabled = false -- This will disable the host, preserving the config, but denying connections
->>>>>>> other
-- 
cgit v1.2.3