fix merge conflict
authorKatja Luther <k.luther@bgbm.org>
Thu, 21 Feb 2019 09:56:44 +0000 (10:56 +0100)
committerKatja Luther <k.luther@bgbm.org>
Thu, 21 Feb 2019 11:24:43 +0000 (12:24 +0100)
commit61ff7940af050b6d25fb76fda8b756fe9bdeb74f
tree6cbeb3b75b0a2c8a7b923e82aa25c97fd05d30ee
parent02f4b5a988726312d5f7262c543f88b1fc2349b0
fix merge conflict
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java