Skip to content
Snippets Groups Projects
Commit 0d0c7e4c authored by OZGCloud's avatar OZGCloud
Browse files

Resolve merge conflict

parent 55f36d93
Branches
Tags
No related merge requests found
...@@ -56,6 +56,7 @@ import { ...@@ -56,6 +56,7 @@ import {
ButtonCardComponent, ButtonCardComponent,
ButtonComponent, ButtonComponent,
CloseIconComponent, CloseIconComponent,
ErrorMessageComponent,
ExclamateIconComponent, ExclamateIconComponent,
RadioButtonCardComponent, RadioButtonCardComponent,
SaveIconComponent, SaveIconComponent,
...@@ -161,6 +162,7 @@ const routes: Routes = [ ...@@ -161,6 +162,7 @@ const routes: Routes = [
TextEditorComponent, TextEditorComponent,
TextareaEditorComponent, TextareaEditorComponent,
BescheidStatusTextComponent, BescheidStatusTextComponent,
ErrorMessageComponent,
], ],
declarations: [ declarations: [
VorgangDetailPageComponent, VorgangDetailPageComponent,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment