Skip to content
Snippets Groups Projects
Commit f36f33f3 authored by Jan Zickermann's avatar Jan Zickermann
Browse files

OZG-4948 Fix bad merge

parent 50070378
No related branches found
No related tags found
No related merge requests found
...@@ -3,10 +3,7 @@ import { CommonModule } from '@angular/common'; ...@@ -3,10 +3,7 @@ import { CommonModule } from '@angular/common';
import { TechSharedModule } from '@alfa-client/tech-shared'; import { TechSharedModule } from '@alfa-client/tech-shared';
import { NavigationItemComponent } from './shared/navigation-item/navigation-item.component'; import { NavigationItemComponent } from './shared/navigation-item/navigation-item.component';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { NavigationContainerComponent } from './navigation-container/navigation-container.component'; import { ReactiveFormsModule } from '@angular/forms';
import { PostfachServiceProvider, SettingsServiceProvider } from './admin-settings-provider';
import { AdminTextFieldComponent } from './shared/text-editor/admin-text-field.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { PostfachContainerComponent } from './postfach/postfach-container/postfach-container.component'; import { PostfachContainerComponent } from './postfach/postfach-container/postfach-container.component';
import { PostfachFormComponent } from './postfach/postfach-container/postfach-form/postfach-form.component'; import { PostfachFormComponent } from './postfach/postfach-container/postfach-form/postfach-form.component';
import { TextFieldComponent } from './shared/text-field/text-field.component'; import { TextFieldComponent } from './shared/text-field/text-field.component';
...@@ -16,17 +13,9 @@ import { TextFieldComponent } from './shared/text-field/text-field.component'; ...@@ -16,17 +13,9 @@ import { TextFieldComponent } from './shared/text-field/text-field.component';
PostfachContainerComponent, PostfachContainerComponent,
PostfachFormComponent, PostfachFormComponent,
NavigationItemComponent, NavigationItemComponent,
NavigationContainerComponent,
AdminTextFieldComponent,
TextFieldComponent, TextFieldComponent,
], ],
imports: [CommonModule, TechSharedModule, RouterModule, ReactiveFormsModule, FormsModule], imports: [CommonModule, TechSharedModule, RouterModule, ReactiveFormsModule],
exports: [ exports: [PostfachContainerComponent, NavigationItemComponent],
PostfachContainerComponent,
NavigationItemComponent,
NavigationContainerComponent,
AdminTextFieldComponent,
],
providers: [SettingsServiceProvider, PostfachServiceProvider],
}) })
export class AdminSettingsModule {} export class AdminSettingsModule {}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment