solved conflicts with master

DSpace · Mar 21, 2019 · d820991 · d820991
1 parent 23a1e6b
commit d820991
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
@@ -7,9 +7,8 @@ import { AppState } from '../../app.reducer';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { coreSelector, CoreState } from '../core.reducers';
+import { CoreState } from '../core.reducers';
 import { IndexName, IndexState, MetaIndexState } from '../index/index.reducer';
-import { pathSelector } from '../shared/selectors';
 import {
   originalRequestUUIDFromRequestUUIDSelector,
   requestIndexSelector,
@@ -27,6 +26,7 @@ import { RequestEntry, RequestState } from './request.reducer';
 import { CommitSSBAction } from '../cache/server-sync-buffer.actions';
 import { RestRequestMethod } from './rest-request-method';
 import { AddToIndexAction, RemoveFromIndexBySubstringAction } from '../index/index.actions';
+import { coreSelector } from '../core.selectors';
 
 const requestCacheSelector = createSelector(
   coreSelector,