log conflict-editor/src/test/resources/log4j.properties @ 29:fc8f3ac948df

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