tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Resolved conflicts

pull/12811/head
mpetrov 2 years ago
parent
d7b1c73799
commit
ca350601bb
1 changed files with 0 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.ts

2
ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.ts
View File

@ -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,

Write Preview
Loading…
Cancel
Save