- removed merge conflict text
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 07:09:41 +0000 (07:09 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 07:09:41 +0000 (07:09 +0000)
commit5411897d0cf111c4d045c63b050b6999447bef6a
treefa73bcea445dcee31bdee9b0f2152bbb6ccf6e09
parentc365ebc7f0806edb2a13292db1fe2182e7e5fb92
 - removed merge conflict text
eu.etaxonomy.taxeditor.cdmlib/build.properties