log conflict-editor/src/test/resources/single-conflict.json @ 42:7380d8ff1a66 default tip

age author description
2011-09-12 Dirk Olmes first drop of the conflict editor - mostly model work