Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into

develop

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
index 73c3b517fa7388ba391dcd246d1c7bc859e9d096,68bcea4a3caa331c454ffe4d2b162c286e83e7d4..d1acdcdc10d48cca113dba3a121920ffc6ad9a67
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
--- 2/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,22 -1069,12 +1069,30 @@@ public class TransientOccurenceService 
          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) {
 +        return defaultService.listDeterminedTaxa(arg0, arg1, arg2, arg3, arg4);
 +    }
 +
 +    @Override
 +    public Collection<TaxonBase<?>> listIndividualsAssociationTaxa(SpecimenOrObservationBase<?> arg0, Integer arg1,
 +            Integer arg2, List<OrderHint> arg3, List<String> arg4) {
 +        return defaultService.listIndividualsAssociationTaxa(arg0, arg1, arg2, arg3, arg4);
 +    }
 +
 +    @Override
 +    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}
+      */
+     @Override
+     public List<SpecimenOrObservationBase> load(List<UUID> arg0, List<String> arg1) {
+         return defaultService.load(arg0, arg1);
      }
  
  }