Fixed merge issues

This commit is contained in:
Giuseppe
2018-10-17 12:25:46 +02:00
parent 8bc7d31864
commit 7b483ce052
43 changed files with 295 additions and 209 deletions

View File

@@ -18,9 +18,9 @@ export class ResourcePolicy implements CacheableObject {
name: string;
/**
* The Group this Resource Policy applies to
* The uuid of the Group this Resource Policy applies to
*/
group: Group;
groupUUID: string;
/**
* The link to the rest endpoint where this Resource Policy can be found