Fix incorrect merge
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 11 Sep 2015 12:42:00 +0000 (14:42 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 11 Sep 2015 12:42:00 +0000 (14:42 +0200)
commitc70f9111a143ba8553060563cbf5665656a4a63b
treeeb5c55d6b9e84d6d19ae973f9d78e6487fa111c0
parentdbe1e57d4c70e8d785eb512d910d963aa515aab6
Fix incorrect merge
eu.etaxonomy.taxeditor.cdmlib/build.properties