From 0d0c7e4cab12070d79f281c102cffb40378b3bfa Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 14 Jun 2024 10:30:28 +0200
Subject: [PATCH] Resolve merge conflict
---
.../libs/vorgang-detail/src/lib/vorgang-detail.module.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 38aca47d99..48fc1910fc 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -56,6 +56,7 @@ import {
ButtonCardComponent,
ButtonComponent,
CloseIconComponent,
+ ErrorMessageComponent,
ExclamateIconComponent,
RadioButtonCardComponent,
SaveIconComponent,
@@ -161,6 +162,7 @@ const routes: Routes = [
TextEditorComponent,
TextareaEditorComponent,
BescheidStatusTextComponent,
+ ErrorMessageComponent,
],
declarations: [
VorgangDetailPageComponent,
--
GitLab