Skip to content
Snippets Groups Projects
Commit d78aea63 authored by Kristof De Langhe's avatar Kristof De Langhe
Browse files

conflict fix

parent 9ac8e2b1
No related branches found
No related tags found
No related merge requests found
...@@ -42,7 +42,7 @@ import { SubmissionSectionsConfigService } from './config/submission-sections-co ...@@ -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 = [ ...@@ -68,9 +68,9 @@ const PROVIDERS = [
HostWindowService, HostWindowService,
ItemDataService, ItemDataService,
MetadataService, MetadataService,
MetadataRegistryService,
ObjectCacheService, ObjectCacheService,
PaginationComponentOptions, PaginationComponentOptions,
RegistryService,
RemoteDataBuildService, RemoteDataBuildService,
RequestService, RequestService,
ResponseCacheService, ResponseCacheService,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment