[CST-4320] resolved merge conflicts

This commit is contained in:
Alessandro Martelli
2021-07-05 16:01:32 +02:00
parent 0212df5bd1
commit f5cd878096

View File

@@ -42,9 +42,12 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
subs = []; subs = [];
constructor(protected route: ActivatedRoute, router: Router, items: ItemDataService, metadataService: MetadataService, authService: AuthService, constructor(protected route: ActivatedRoute,
router: Router,
items: ItemDataService,
authService: AuthService,
private _location: Location) { private _location: Location) {
super(route, router, items, metadataService, authService); super(route, router, items, authService);
} }
/*** AoT inheritance fix, will hopefully be resolved in the near future **/ /*** AoT inheritance fix, will hopefully be resolved in the near future **/