From 57c525d1788e8cdc753660f0b27434b43da267eb Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Wed, 8 Nov 2017 16:26:36 +0100
Subject: [PATCH] solved merge issues

---
 src/app/+search-page/search-page.component.ts | 1 -
 src/app/shared/shared.module.ts               | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index 04d8f5ce3d..3026256ec8 100644
--- a/src/app/+search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -1,6 +1,5 @@
 import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
 import { SortOptions } from '../core/cache/models/sort-options.model';
 import { CommunityDataService } from '../core/data/community-data.service';
 import { RemoteData } from '../core/data/remote-data';
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 85aeca5390..245d45ea4e 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -67,9 +67,6 @@ const COMPONENTS = [
   ViewModeSwitchComponent
 ];
 
-const DIRECTIVES = [
-];
-
 const ENTRY_COMPONENTS = [
   // put shared entry components (components that are created dynamically) here
   CollectionListElementComponent,