From 247033dbeb55c64fc6f997f3d75b546659281137 Mon Sep 17 00:00:00 2001
From: Pilzinsel64 <pilzinsel64@gmx.de>
Date: Tue, 20 May 2025 07:57:34 +0200
Subject: [PATCH] fix merge conflict

---
 Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs
index c7f9218..b0f05ba 100644
--- a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs
+++ b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs
@@ -241,7 +241,6 @@ public partial class RadFlyoutBase : UserControl
             {
                 frm.ClientSize = Size;
             }
-        }
 
             frm.Shown += Form_Shown;
         }