Fix merge issues

This commit is contained in:
Yana De Pauw
2023-01-13 14:35:40 +01:00
parent 419cb947d9
commit e2087ad952
15 changed files with 96 additions and 47 deletions

View File

@@ -16,6 +16,7 @@ import { StatisticsModule } from '../statistics/statistics.module';
import { CollectionFormModule } from './collection-form/collection-form.module';
import { ThemedCollectionPageComponent } from './themed-collection-page.component';
import { ComcolModule } from '../shared/comcol/comcol.module';
import { DsoPageModule } from '../shared/dso-page/dso-page.module';
@NgModule({
imports: [
@@ -26,6 +27,7 @@ import { ComcolModule } from '../shared/comcol/comcol.module';
EditItemPageModule,
CollectionFormModule,
ComcolModule,
DsoPageModule,
],
declarations: [
CollectionPageComponent,