diff conflict-editor/src/test/resources/no-conflicts.json @ 38:6c85a4fcfe28

add a toplevel pom, make this a reactor build
author Dirk Olmes <dirk@xanthippe.ping.de>
date Sun, 09 Oct 2011 07:29:59 +0200
parents 6f11757c4811
children
line wrap: on
line diff