From f5cd878096830d4b03b8c1f585607b65f47158b8 Mon Sep 17 00:00:00 2001 From: Alessandro Martelli Date: Mon, 5 Jul 2021 16:01:32 +0200 Subject: [PATCH] [CST-4320] resolved merge conflicts --- src/app/+item-page/full/full-item-page.component.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/+item-page/full/full-item-page.component.ts b/src/app/+item-page/full/full-item-page.component.ts index 5e1bec7656..7f1b6de614 100644 --- a/src/app/+item-page/full/full-item-page.component.ts +++ b/src/app/+item-page/full/full-item-page.component.ts @@ -42,9 +42,12 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit, 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) { - super(route, router, items, metadataService, authService); + super(route, router, items, authService); } /*** AoT inheritance fix, will hopefully be resolved in the near future **/