post-merge changes

This commit is contained in:
Jonas Winkler
2020-11-22 23:12:24 +01:00
parent d252a1dcda
commit 6cf0b851b7
10 changed files with 437 additions and 99 deletions

View File

@@ -45,6 +45,7 @@ import { SavedViewWidgetComponent } from './components/dashboard/widgets/saved-v
import { StatisticsWidgetComponent } from './components/dashboard/widgets/statistics-widget/statistics-widget.component';
import { UploadFileWidgetComponent } from './components/dashboard/widgets/upload-file-widget/upload-file-widget.component';
import { WidgetFrameComponent } from './components/dashboard/widgets/widget-frame/widget-frame.component';
import { ConsumerStatusWidgetComponent } from './components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component';
@NgModule({
declarations: [
@@ -82,6 +83,7 @@ import { WidgetFrameComponent } from './components/dashboard/widgets/widget-fram
SavedViewWidgetComponent,
StatisticsWidgetComponent,
UploadFileWidgetComponent,
ConsumerStatusWidgetComponent,
WidgetFrameComponent
],
imports: [