log conflict-editor/src/test/resources/single-conflict.json @ 13:e99bb691f7ce

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