prosody
32122251d2fe
tests/test_core_configmanager.lua

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

Software / code / prosody

Comparison

tests/test_core_configmanager.lua @ 525:32122251d2fe

Remove stray merge marker
author Matthew Wild <mwild1@gmail.com>
date Wed, 03 Dec 2008 16:01:58 +0000
parent 519:cccd610a0ef9
child 615:4ae3e81513f3
comparison
equal deleted inserted replaced
524:3f9f67f1a106 525:32122251d2fe