mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove stray merge marker

Browse source
This commit is contained in:
Matthew Wild 2008-12-03 16:01:58 +00:00
parent e9c064e355
commit b70b5a847d
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
prosody.cfg.lua.dist
View file

@ -75,4 +75,3 @@ Host "example.com"
}
enabled = false -- This will disable the host, preserving the config, but denying connections
>>>>>>> other