--- a/prosody.cfg.lua.dist Wed Dec 03 19:57:08 2008 +0500
+++ b/prosody.cfg.lua.dist Wed Dec 03 15:09:58 2008 +0000
@@ -49,7 +49,7 @@
"ping"; -- XMPP Ping
"time"; -- Let others know the time here
"uptime"; -- Uptime reporting
- "console"; -- telnet to port 5528 (needs console_enabled = true)
+ "console"; -- telnet to port 5582 (needs console_enabled = true)
};
-- These are the SSL/TLS-related settings. If you don't want
@@ -75,4 +75,4 @@
}
enabled = false -- This will disable the host, preserving the config, but denying connections
-
+>>>>>>> other