prosody
32122251d2fe
prosody.cfg.lua.dist

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosody.cfg.lua.dist @ 525:32122251d2fe

Remove stray merge marker
author Matthew Wild <mwild1@gmail.com>
date Wed, 03 Dec 2008 16:01:58 +0000
parent 524:3f9f67f1a106
child 911:39133bca5938
comparison
equal deleted inserted replaced
524:3f9f67f1a106 525:32122251d2fe
73 key = "certs/example.com.key"; 73 key = "certs/example.com.key";
74 certificate = "certs/example.com.crt"; 74 certificate = "certs/example.com.crt";
75 } 75 }
76 76
77 enabled = false -- This will disable the host, preserving the config, but denying connections 77 enabled = false -- This will disable the host, preserving the config, but denying connections
78 >>>>>>> other