Fix incorrect merge
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 11 Sep 2015 13:29:12 +0000 (15:29 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 11 Sep 2015 13:29:12 +0000 (15:29 +0200)
commit253716a14a1625d9d5aa54002457aa2931813d11
treefc89d979f05ff69b1a186e367a0be63e8151cd90
parentc70f9111a143ba8553060563cbf5665656a4a63b
Fix incorrect merge
eu.etaxonomy.taxeditor.cdmlib/build.properties