hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-15 22:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'resolvers-branch-angular6' into w2p-57053_menu-angular6

Browse Source 
Conflicts:
	src/app/app.module.ts
	src/app/header/header.component.ts
	src/app/navbar/navbar.effects.ts
This commit is contained in:
lotte
2018-11-12 09:49:26 +01:00
parent 83bf3ab8b8 54dad64ab4
commit 17239cd1be
230 changed files with 6657 additions and 7197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/navbar/navbar.effects.spec.ts
View File

@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
import { NavbarEffects } from './navbar.effects';
import { NavbarCollapseAction } from './navbar.actions';
import { HostWindowResizeAction } from '../shared/host-window.actions';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
import { provideMockActions } from '@ngrx/effects/testing';
import { cold, hot } from 'jasmine-marbles';
import * as fromRouter from '@ngrx/router-store';