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

age author description
Mon, 12 Sep 2011 11:47:48 +0200 Dirk Olmes first drop of the conflict editor - mostly model work