fixing merge conflicts

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

View File

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