Remove stray merge marker
authorMatthew Wild <mwild1@gmail.com>
Wed, 3 Dec 2008 16:01:58 +0000 (16:01 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 3 Dec 2008 16:01:58 +0000 (16:01 +0000)
commit8d848fa099cc8f7769dc7dc5313a1d2cee989f44
treedac2c2a81339f49c0573fd0055597e1c04a238b6
parent10904eb0553bd5e6efadbd8ab04ed77c49aa03b9
Remove stray merge marker
prosody.cfg.lua.dist