aboutsummaryrefslogtreecommitdiffstats
path: root/util-src
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-03 16:01:58 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-03 16:01:58 +0000
commitb70b5a847d3756582102a0f1f66040c4824825ca (patch)
treedac2c2a81339f49c0573fd0055597e1c04a238b6 /util-src
parente9c064e355fee23eca94878748b4b182d1d625ac (diff)
downloadprosody-b70b5a847d3756582102a0f1f66040c4824825ca.tar.gz
prosody-b70b5a847d3756582102a0f1f66040c4824825ca.zip
Remove stray merge marker
Diffstat (limited to 'util-src')
0 files changed, 0 insertions, 0 deletions