diff options
| author | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-27 05:13:29 +0200 |
|---|---|---|
| committer | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-27 05:13:29 +0200 |
| commit | cab50e2c5272c1599e3b3e30522985b912a19ab7 (patch) | |
| tree | d28ffc8f1e385a1427f004691b74960c6444ecf1 /frontend/src/app/app.module.ts | |
| parent | 982a04c28dcb401fa722cb48976379a1cf6298d8 (diff) | |
| parent | a315d3c0bc44c091d7c85697c9c8135b314ebc06 (diff) | |
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
# Conflicts:
# frontend/src/app/app.module.ts
Diffstat (limited to 'frontend/src/app/app.module.ts')
| -rw-r--r-- | frontend/src/app/app.module.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 1521c013..5d7af9d2 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -37,6 +37,7 @@ import { NotificationsComponent } from './_elements/notifications/notifications. import { DatatableComponent } from './_elements/datatable/datatable.component'; import { FilterDatasetsComponent } from './_pages/filter-datasets/filter-datasets.component'; import { ReactiveBackgroundComponent } from './_elements/reactive-background/reactive-background.component'; +import { ItemModelComponent } from './_elements/item-model/item-model.component'; @NgModule({ declarations: [ @@ -63,7 +64,8 @@ import { ReactiveBackgroundComponent } from './_elements/reactive-background/rea NotificationsComponent, DatatableComponent, FilterDatasetsComponent, - ReactiveBackgroundComponent + ReactiveBackgroundComponent, + ItemModelComponent ], imports: [ BrowserModule, |