From 5a24645dad36bf6484e9d855d489acda9d65e908 Mon Sep 17 00:00:00 2001
From: Christian <christian.baeurle@ownsoft.de>
Date: Mon, 20 Jul 2026 14:42:30 +0200
Subject: [PATCH] =?UTF-8?q?Merge=20Konflikt=20in=20BeWoAllReports=20gel?=
 =?UTF-8?q?=C3=B6st?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWoAllReports.sln                            | 27 +++++++++++++++++++
 .../BEWODIREKTGmbH/BEWODIREKTGmbH.csproj      |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln
index 30e9f8500..22406f3c1 100644
--- a/BeWoAllReports.sln
+++ b/BeWoAllReports.sln
@@ -1006,6 +1006,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FabiansDatenbank", "ReportI
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VereinZurIntegrationChemnitz", "ReportImp\VereinZurIntegrationChemnitz\VereinZurIntegrationChemnitz.csproj", "{EA969934-60A6-459F-A07C-1CF537ED775E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BEWODIREKTGmbH", "ReportImp\BEWODIREKTGmbH\BEWODIREKTGmbH.csproj", "{B549B705-DA0C-40A6-85D9-27D6852BC991}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -12344,6 +12346,30 @@ Global
 		{EA969934-60A6-459F-A07C-1CF537ED775E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EA969934-60A6-459F-A07C-1CF537ED775E}.Release|x86.ActiveCfg = Release|Any CPU
 		{EA969934-60A6-459F-A07C-1CF537ED775E}.Release|x86.Build.0 = Release|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Debug|.NET.Build.0 = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Debug|x86.Build.0 = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.DebugRemote|x86.Build.0 = Debug|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Release|.NET.ActiveCfg = Release|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Release|.NET.Build.0 = Release|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Release|x86.ActiveCfg = Release|Any CPU
+		{B549B705-DA0C-40A6-85D9-27D6852BC991}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -12841,6 +12867,7 @@ Global
 		{D80E7BBD-F017-4FBB-B3D3-5AD9F43C418D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{2B6F428D-8F97-4638-AF6B-907CB98D9869} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{EA969934-60A6-459F-A07C-1CF537ED775E} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{B549B705-DA0C-40A6-85D9-27D6852BC991} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}
diff --git a/ReportImp/BEWODIREKTGmbH/BEWODIREKTGmbH.csproj b/ReportImp/BEWODIREKTGmbH/BEWODIREKTGmbH.csproj
index 962a289a1..45ae321ab 100644
--- a/ReportImp/BEWODIREKTGmbH/BEWODIREKTGmbH.csproj
+++ b/ReportImp/BEWODIREKTGmbH/BEWODIREKTGmbH.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C1FED668-ADB9-47E0-B589-1389618E1B6E}</ProjectGuid>
+    <ProjectGuid>{B549B705-DA0C-40A6-85D9-27D6852BC991}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BEWODIREKTGmbH</RootNamespace>