Fix remaining conflict
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 23 Jun 2015 11:18:06 +0000 (13:18 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 23 Jun 2015 11:18:06 +0000 (13:18 +0200)
commit530ba36728a03ec737fe2147af267a5bb31f78ae
treeea6121a37e1c66fea60a91477ee79c5cb083b335
parentd2fa54b8c7852561989edc7f686d92a6e8971782
Fix remaining conflict
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java