From 9447b618ea033218136489b036ff3080e504b962 Mon Sep 17 00:00:00 2001
From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 30 Nov 2015 10:32:29 +0100
Subject: [PATCH] Fix incorrect merge

---
 .../dataimport/transientServices/TransientOccurenceService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
index d1acdcdc1..40481a91f 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
@@ -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}
-- 
2.34.1