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)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java

index d1acdcd..40481a9 100644 (file)
@@ -1069,7 +1069,6 @@ public class TransientOccurenceService implements IOccurrenceService {
         return defaultService.listDeterminationEvents(arg0, arg1, arg2, arg3, arg4);
     }
 
-<<<<<<< HEAD
     @Override
     public Collection<TaxonBase<?>> listDeterminedTaxa(SpecimenOrObservationBase<?> arg0, Integer arg1, Integer arg2,
             List<OrderHint> arg3, List<String> arg4) {
@@ -1086,6 +1085,7 @@ public class TransientOccurenceService implements IOccurrenceService {
     public Collection<TaxonBase<?>> listTypeDesignationTaxa(SpecimenOrObservationBase<?> arg0, Integer arg1,
             Integer arg2, List<OrderHint> arg3, List<String> arg4) {
         return defaultService.listTypeDesignationTaxa(arg0, arg1, arg2, arg3, arg4);
+    }
 
      /**
      * {@inheritDoc}