aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
Diffstat (limited to 'prosody.cfg.lua.dist')
-rw-r--r--prosody.cfg.lua.dist1
1 files changed, 0 insertions, 1 deletions
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