From 5151c8ee445ba25f71425e24b52fb984e8a50e50 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Tue, 18 Jun 2024 13:46:27 +0200
Subject: [PATCH] Merge Error

---
 BeWo/BeWo.csproj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 9d06e26af..0bedf8b4d 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -3187,12 +3187,9 @@
     <Resource Include="Ressources\Icons\Copy24.png" />
   </ItemGroup>
   <ItemGroup>
-<<<<<<< HEAD
-=======
     <Resource Include="Ressources\Icons\CalendarDisabledUnderConstruction.png" />
   </ItemGroup>
   <ItemGroup>
->>>>>>> master
     <Resource Include="Ressources\Icons\AB.png" />
   </ItemGroup>
   <ItemGroup>