X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody.cfg.lua.dist;h=7289921a319ba72b7519f991f2b0b4f922e02e9e;hb=d3d92c7ae41f7f89347c537959e826aae5420303;hp=5a0fab713ef4be8d4809731243a9507381455fe5;hpb=10904eb0553bd5e6efadbd8ab04ed77c49aa03b9;p=prosody.git

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