Project

General

Profile

« Previous | Next » 

Revision 9447b618

Added by Patrick Plitzner over 6 years ago

Fix incorrect merge

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
1069 1069
        return defaultService.listDeterminationEvents(arg0, arg1, arg2, arg3, arg4);
1070 1070
    }
1071 1071

  
1072
<<<<<<< HEAD
1073 1072
    @Override
1074 1073
    public Collection<TaxonBase<?>> listDeterminedTaxa(SpecimenOrObservationBase<?> arg0, Integer arg1, Integer arg2,
1075 1074
            List<OrderHint> arg3, List<String> arg4) {
......
1086 1085
    public Collection<TaxonBase<?>> listTypeDesignationTaxa(SpecimenOrObservationBase<?> arg0, Integer arg1,
1087 1086
            Integer arg2, List<OrderHint> arg3, List<String> arg4) {
1088 1087
        return defaultService.listTypeDesignationTaxa(arg0, arg1, arg2, arg3, arg4);
1088
    }
1089 1089

  
1090 1090
     /**
1091 1091
     * {@inheritDoc}

Also available in: Unified diff