From a4e9b791c56c3f4cd17be880bcb1e0feff8136eb Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Wed, 22 May 2024 12:59:06 +0200 Subject: [PATCH] Force git conflict --- BeWo/BeWoApp.xaml.cs | 3 ++- BeWo/Loader.cs | 1 + BeWo/LoginControl.xaml | 2 ++ BeWo/LoginControl.xaml.cs | 3 +-- Service/Multitenancy/DMultitenancyEndpointBehavior.cs | 2 +- Service/Multitenancy/DMultitenancyHeader.cs | 2 +- Service/Multitenancy/DMultitenancyInterceptor.cs | 2 +- Service/ServiceImplementations/DownloadBeWoServiceImp.cs | 2 +- Service/ServiceImplementations/LauncherServiceImp.cs | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 2ff6ce89b..4e5c8b1e7 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -1103,4 +1103,5 @@ namespace BeWo #endif } } -} \ No newline at end of file +} + diff --git a/BeWo/Loader.cs b/BeWo/Loader.cs index f7a707c69..349dab55f 100644 --- a/BeWo/Loader.cs +++ b/BeWo/Loader.cs @@ -35,3 +35,4 @@ namespace BeWo } } } + diff --git a/BeWo/LoginControl.xaml b/BeWo/LoginControl.xaml index 54a5b8558..140a24d2a 100644 --- a/BeWo/LoginControl.xaml +++ b/BeWo/LoginControl.xaml @@ -197,3 +197,5 @@ + + \ No newline at end of file diff --git a/BeWo/LoginControl.xaml.cs b/BeWo/LoginControl.xaml.cs index 73fa02310..e37831e1f 100644 --- a/BeWo/LoginControl.xaml.cs +++ b/BeWo/LoginControl.xaml.cs @@ -675,7 +675,6 @@ namespace BeWo } - if (ProfileList.Count == 0 || profileSelectionComboBox.SelectedItem == null) { MessageBox.Show( @@ -1414,4 +1413,4 @@ namespace BeWo return key1.Equals(key2); } } -} +} \ No newline at end of file diff --git a/Service/Multitenancy/DMultitenancyEndpointBehavior.cs b/Service/Multitenancy/DMultitenancyEndpointBehavior.cs index 5def827ca..1a5420ab6 100644 --- a/Service/Multitenancy/DMultitenancyEndpointBehavior.cs +++ b/Service/Multitenancy/DMultitenancyEndpointBehavior.cs @@ -25,4 +25,4 @@ namespace BeWo.Service.Multitenancy { } } -} \ No newline at end of file +} diff --git a/Service/Multitenancy/DMultitenancyHeader.cs b/Service/Multitenancy/DMultitenancyHeader.cs index 6186a9160..6855d846a 100644 --- a/Service/Multitenancy/DMultitenancyHeader.cs +++ b/Service/Multitenancy/DMultitenancyHeader.cs @@ -36,4 +36,4 @@ namespace BeWo.Service.Multitenancy writer.WriteElementString("Tenant", this.Tenant); } } -} \ No newline at end of file +} diff --git a/Service/Multitenancy/DMultitenancyInterceptor.cs b/Service/Multitenancy/DMultitenancyInterceptor.cs index 766a6d193..b45dfaa4f 100644 --- a/Service/Multitenancy/DMultitenancyInterceptor.cs +++ b/Service/Multitenancy/DMultitenancyInterceptor.cs @@ -18,4 +18,4 @@ namespace BeWo.Service.Multitenancy return null; } } -} \ No newline at end of file +} diff --git a/Service/ServiceImplementations/DownloadBeWoServiceImp.cs b/Service/ServiceImplementations/DownloadBeWoServiceImp.cs index 19a9f8bc3..b86e80dfd 100644 --- a/Service/ServiceImplementations/DownloadBeWoServiceImp.cs +++ b/Service/ServiceImplementations/DownloadBeWoServiceImp.cs @@ -110,4 +110,4 @@ namespace BeWo.Service.ServiceImplementations return true; } } -} \ No newline at end of file +} diff --git a/Service/ServiceImplementations/LauncherServiceImp.cs b/Service/ServiceImplementations/LauncherServiceImp.cs index 924f23c94..2afcdd34d 100644 --- a/Service/ServiceImplementations/LauncherServiceImp.cs +++ b/Service/ServiceImplementations/LauncherServiceImp.cs @@ -181,4 +181,4 @@ namespace BeWo.Service.ServiceImplementations public bool GetEmailForUserName(string pUserName, Uri serverName, out string email) => (new UserServiceImp()).GetEmailForUserName(pUserName, serverName, out email); } -} \ No newline at end of file +}