Fix incorrect merge
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 30 Nov 2015 09:32:29 +0000 (10:32 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 30 Nov 2015 09:32:29 +0000 (10:32 +0100)
commit9447b618ea033218136489b036ff3080e504b962
tree05e2f15f1694bc9e87764f1b448d9d931fbf322b
parent78d55600ea5dc9f38f7bd9c831ca824b2baf3344
Fix incorrect merge
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java