Skip to content

Commit

Permalink
merge conflict missed a line
Browse files Browse the repository at this point in the history
  • Loading branch information
siddheshraze committed Oct 11, 2024
1 parent 1d099bc commit b38965f
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions frontend/config/datamapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,19 @@ import { bitToBoolean, booleanToBit } from './macros';
import { Common, ResultType, Unique } from '@/config/utils';
import {
FamilyRDS,
FamilyResult, GenusRDS, GenusResult, ReferenceRDS, ReferenceResult, SpeciesInventoryRDS, SpeciesInventoryResult,
FamilyResult,
GenusRDS,
GenusResult,
ReferenceRDS,
ReferenceResult,
SpeciesInventoryRDS,
SpeciesInventoryResult,
SpeciesLimitsRDS,
SpeciesLimitsResult,
SpeciesRDS,
SpeciesResult, SpecimensRDS, SpecimensResult,
SpeciesResult,
SpecimensRDS,
SpecimensResult,
StemRDS,
StemResult
} from '@/config/sqlrdsdefinitions/taxonomies';
Expand Down Expand Up @@ -197,8 +205,6 @@ class MapperFactory {
return new GenericMapper<CMVErrorRDS, CMVErrorResult>() as unknown as IDataMapper<RDS, Result>;
case 'cmattributes':
return new GenericMapper<CMAttributesRDS, CMAttributesResult>() as unknown as IDataMapper<RDS, Result>;
case 'measurementssummary_draft':
return new GenericMapper<MeasurementsSummaryDraftRDS, MeasurementsSummaryDraftResult>() as unknown as IDataMapper<RDS, Result>;
case 'measurementssummary':
case 'measurementssummaryview':
return new GenericMapper<MeasurementsSummaryRDS, MeasurementsSummaryResult>() as unknown as IDataMapper<RDS, Result>;
Expand Down

0 comments on commit b38965f

Please sign in to comment.