From d78aea63ec8bc337258953df8612f07eadc5bad8 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 29 Mar 2018 16:01:26 +0200
Subject: [PATCH] conflict fix
---
src/app/core/core.module.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 7695ff1849..4e902f6b35 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -42,7 +42,7 @@ import { SubmissionSectionsConfigService } from './config/submission-sections-co
import { UUIDService } from './shared/uuid.service';
import { HALEndpointService } from './shared/hal-endpoint.service';
import { FacetResponseParsingService } from './data/facet-response-parsing.service';
-import { MetadataRegistryService } from './metadata/metadataregistry.service';
+import { RegistryService } from './registry/registry.service';
const IMPORTS = [
CommonModule,
@@ -68,9 +68,9 @@ const PROVIDERS = [
HostWindowService,
ItemDataService,
MetadataService,
- MetadataRegistryService,
ObjectCacheService,
PaginationComponentOptions,
+ RegistryService,
RemoteDataBuildService,
RequestService,
ResponseCacheService,
--
GitLab