diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-12-03 16:01:58 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-12-03 16:01:58 +0000 |
| commit | b70b5a847d3756582102a0f1f66040c4824825ca (patch) | |
| tree | dac2c2a81339f49c0573fd0055597e1c04a238b6 | |
| parent | e9c064e355fee23eca94878748b4b182d1d625ac (diff) | |
| download | prosody-b70b5a847d3756582102a0f1f66040c4824825ca.tar.gz prosody-b70b5a847d3756582102a0f1f66040c4824825ca.zip | |
Remove stray merge marker
| -rw-r--r-- | prosody.cfg.lua.dist | 1 |
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
|