Resolved conflicts
This commit is contained in:
parent
d7b1c73799
commit
ca350601bb
@ -58,8 +58,6 @@ export class CalculatedFieldsTableComponent {
|
|||||||
private dialog: MatDialog,
|
private dialog: MatDialog,
|
||||||
private store: Store<AppState>,
|
private store: Store<AppState>,
|
||||||
private datePipe: DatePipe,
|
private datePipe: DatePipe,
|
||||||
private durationLeft: DurationLeftPipe,
|
|
||||||
private popoverService: TbPopoverService,
|
|
||||||
private cd: ChangeDetectorRef,
|
private cd: ChangeDetectorRef,
|
||||||
private renderer: Renderer2,
|
private renderer: Renderer2,
|
||||||
private importExportService: ImportExportService,
|
private importExportService: ImportExportService,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user