log conflict-editor/src/test/resources/single-conflict.json @ 35:a3f88353554a

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