comparison tests/test-conflict @ 1169:e388c4f5cec5

Reverted changeset e254bcbfe636e97301f76c7da241b07be14f3d36 Volker Kleinfeld agreed that this is dead code and tried to fix a problem which was already fixed somewhere else.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 30 Aug 2005 21:26:27 +0200
parents 0902ffece4b4
children c71420b186b0
comparison
equal deleted inserted replaced
1168:235e0effa672 1169:e388c4f5cec5