Software /
code /
prosody
Diff
util-src/encodings.c @ 525:32122251d2fe
Remove stray merge marker
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Wed, 03 Dec 2008 16:01:58 +0000 |
parent | 520:e96ac4bb6dd8 |
child | 601:6cb908ef01c8 |