log conflict-editor/src/test/resources/no-conflicts.json @ 26:ca9c62a68e87

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