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

Resolved merge conflicts.

Browse Source
This commit is contained in:
William Welling
2016-12-02 08:02:08 -06:00
parent b56fc730c5 c87a20ea25
commit 925f33ce17
9 changed files with 82 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/shared/shared.module.ts
View File

@@ -4,6 +4,7 @@ import { RouterModule } from '@angular/router';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from 'ng2-translate/ng2-translate';
import { ApiService } from './api.service';
import { ModelService } from './model/model.service';
@@ -12,6 +13,7 @@ const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
CommonModule,
RouterModule,
TranslateModule,
FormsModule,
ReactiveFormsModule,
NgbModule