Remove stray merge marker

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 5a0fab713ef4be8d4809731243a9507381455fe5..7289921a319ba72b7519f991f2b0b4f922e02e9e 100644 (file)
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -75,4 +75,3 @@ Host "example.com"
                }\r
 \r
        enabled = false -- This will disable the host, preserving the config, but denying connections\r
->>>>>>> other\r