Mergeprobleme gefixt
This commit is contained in:
@@ -996,6 +996,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SonjaZoeller", "ReportImp\S
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JusinaJugendhilfe", "ReportImp\JusinaJugendhilfe\JusinaJugendhilfe.csproj", "{7005F526-E0FE-49F8-86D5-90F2DAC51E3B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HwHilfswerkInklusionUndTeilhabe", "ReportImp\HwHilfswerkInklusionUndTeilhabe\HwHilfswerkInklusionUndTeilhabe.csproj", "{A65F19C6-A523-4566-8855-9141B9435B95}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaritasAichachFriedberg", "ReportImp\CaritasAichachFriedberg\CaritasAichachFriedberg.csproj", "{279D4AEA-239C-4A2C-91DE-735EB7A72F96}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|.NET = Debug|.NET
|
||||
@@ -12214,6 +12218,54 @@ Global
|
||||
{7005F526-E0FE-49F8-86D5-90F2DAC51E3B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{7005F526-E0FE-49F8-86D5-90F2DAC51E3B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{7005F526-E0FE-49F8-86D5-90F2DAC51E3B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Debug|.NET.ActiveCfg = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Debug|.NET.Build.0 = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.DebugRemote|.NET.Build.0 = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.DebugRemote|x86.Build.0 = Debug|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Release|.NET.ActiveCfg = Release|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Release|.NET.Build.0 = Release|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95}.Release|x86.Build.0 = Release|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Debug|.NET.ActiveCfg = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Debug|.NET.Build.0 = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.DebugRemote|.NET.Build.0 = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.DebugRemote|x86.Build.0 = Debug|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Release|.NET.ActiveCfg = Release|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Release|.NET.Build.0 = Release|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -12706,6 +12758,8 @@ Global
|
||||
{E23C4943-8677-40DA-A45F-1322D1AD2443} = {D8A691C5-146D-4613-86CC-438F02FE9106}
|
||||
{B202DD74-4CA3-4A48-A8FB-A7B0E090DDAA} = {D8A691C5-146D-4613-86CC-438F02FE9106}
|
||||
{7005F526-E0FE-49F8-86D5-90F2DAC51E3B} = {D8A691C5-146D-4613-86CC-438F02FE9106}
|
||||
{A65F19C6-A523-4566-8855-9141B9435B95} = {D8A691C5-146D-4613-86CC-438F02FE9106}
|
||||
{279D4AEA-239C-4A2C-91DE-735EB7A72F96} = {D8A691C5-146D-4613-86CC-438F02FE9106}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}
|
||||
|
||||
@@ -354,7 +354,7 @@ namespace BeWo.Service.Plugins
|
||||
//t = "3522103738"; // AWO Münsterland-Recklinghausen
|
||||
//t = "5592509446"; // Kontakt Verein für psychosoziale Hilfen e.V
|
||||
//t = "5344902949"; // SHK Service GmbH SBD
|
||||
t = "1422963536"; // Malteser-Johanniter-Johanneshaus gGmbH
|
||||
//t = "1422963536"; // Malteser-Johanniter-Johanneshaus gGmbH
|
||||
//t = "5433105975"; // aha e.V.
|
||||
//t = "1701920223"; // SKFM Monheim
|
||||
//t = "5484692276"; // SPEKTRUM GmbH
|
||||
@@ -436,7 +436,12 @@ namespace BeWo.Service.Plugins
|
||||
//t = "3583014513"; // Bezirksverein für soziale Rechtspflege Villingen-Schwenningen Körperschaft des öffentlichen Rechts Sebastian Kopp
|
||||
//t = "1561235939"; // Arya Steffens - Hevia Therapie
|
||||
//t = "5192639354"; // Socius Sonja Zöller
|
||||
t = "4377552356"; // Jusina Jugendhilfe
|
||||
//t = "4377552356"; // Jusina Jugendhilfe
|
||||
//t = "4593477132"; // DROB Drogenhilfe
|
||||
//t = "5992366040"; // Rom e.V.
|
||||
//t = "9999999999"; // Claude Stundenkontotest
|
||||
//t = "4341679073"; // Caritasverband für den Landkreis Aichach-Friedberg e.V.
|
||||
//t = "1996525562"; // HW Hilfswerk Inklusion und Teilhabe
|
||||
|
||||
return t;
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user