1
0

conflict fix

This commit is contained in:
Kristof De Langhe
2018-03-29 16:01:26 +02:00
parent 9ac8e2b18a
commit d78aea63ec

View File

@@ -42,7 +42,7 @@ import { SubmissionSectionsConfigService } from './config/submission-sections-co
import { UUIDService } from './shared/uuid.service'; import { UUIDService } from './shared/uuid.service';
import { HALEndpointService } from './shared/hal-endpoint.service'; import { HALEndpointService } from './shared/hal-endpoint.service';
import { FacetResponseParsingService } from './data/facet-response-parsing.service'; import { FacetResponseParsingService } from './data/facet-response-parsing.service';
import { MetadataRegistryService } from './metadata/metadataregistry.service'; import { RegistryService } from './registry/registry.service';
const IMPORTS = [ const IMPORTS = [
CommonModule, CommonModule,
@@ -68,9 +68,9 @@ const PROVIDERS = [
HostWindowService, HostWindowService,
ItemDataService, ItemDataService,
MetadataService, MetadataService,
MetadataRegistryService,
ObjectCacheService, ObjectCacheService,
PaginationComponentOptions, PaginationComponentOptions,
RegistryService,
RemoteDataBuildService, RemoteDataBuildService,
RequestService, RequestService,
ResponseCacheService, ResponseCacheService,