ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Konflikt in BeWoAllReports gelöst

Browse Source
This commit is contained in:
Christian
2026-07-20 14:42:30 +02:00
parent 0371bae325
commit 5a24645dad
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
BeWoAllReports.sln
View File

@@ -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}

2
ReportImp/BEWODIREKTGmbH/BEWODIREKTGmbH.csproj
View File

@@ -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>