diff conflict-editor/src/test/resources/single-conflict.json @ 40:fd71a5d17fd9

remove commented stuff
author Dirk Olmes <dirk@xanthippe.ping.de>
date Sun, 09 Oct 2011 08:15:37 +0200
parents 6f11757c4811
children
line wrap: on
line diff