log conflict-editor/src/test/resources/no-conflicts.json @ 6:001511e41f96

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