fix the merge conflicts of hotfix branch
authorKatja Luther <k.luther@bgbm.org>
Wed, 10 Feb 2016 16:03:23 +0000 (17:03 +0100)
committerKatja Luther <k.luther@bgbm.org>
Wed, 10 Feb 2016 16:03:23 +0000 (17:03 +0100)
commit1d4745e68db9c71a3eaf2aaab07498881849735e
treeafa7c90b6784848e23f823fc2cf50283e2ded4da
parente30acb09efea346be1f06057b15a2930a1201261
fix the merge conflicts of hotfix branch
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java