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

fixing merge conflicts

Browse Source
This commit is contained in:
Art Lowel
2017-05-18 17:57:51 +02:00
parent 4eaa5e8471
commit 71c1e3a549
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/shared/community.model.ts
View File

@@ -50,7 +50,7 @@ export class Community extends DSpaceObject {
/** /**
* An array of Communities that are direct parents of this Community * An array of Communities that are direct parents of this Community
*/ */
parents: Array<Community>; parents: Array<RemoteData<DSpaceObject>>;
/** /**
* The Community that owns this Community * The Community that owns this Community

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

@@ -6,7 +6,7 @@ import { CommonModule } from "@angular/common";
import { TopLevelCommunityListComponent } from "./top-level-community-list/top-level-community-list.component"; import { TopLevelCommunityListComponent } from "./top-level-community-list/top-level-community-list.component";
import { HomeNewsComponent } from "./home-news/home-news.component"; import { HomeNewsComponent } from "./home-news/home-news.component";
import { RouterModule } from "@angular/router"; import { RouterModule } from "@angular/router";
import { TranslateModule } from "ng2-translate"; import { TranslateModule } from "@ngx-translate/core";
@NgModule({ @NgModule({
imports: [ imports: [