Resolve merge conflict
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 15 Feb 2016 10:44:32 +0000 (11:44 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 15 Feb 2016 10:44:32 +0000 (11:44 +0100)
commitba2406c1fcdbf48a87b35ed66d4627f5ddab2f92
treedf52c8a822fb9737eb7a10820ae36c49f6357aab
parentd08c79ee8b5ea0a6294ef8cd7e79714e3fe32f1c
Resolve merge conflict
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java