tests/test-merge4.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 07 Sep 2007 16:14:51 +0200
changeset 5287 c6f932d3e0f6
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Don't decode unicode strings. This does not work with python2.3 and is probably not useful anyway with 2.4.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)