mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 18:14:17 +00:00
[CST-4320] resolved merge conflicts
This commit is contained in:
@@ -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 **/
|
||||||
|
Reference in New Issue
Block a user