[FIX] fixed merge conflicts

2020-10-21 20:56:38 +02:00
parent 298bd760e5 a4e45b1a6b
commit 61577e0df7
9 changed files with 94 additions and 32 deletions
--- a/Client/Views/MainWindow.xaml.cs
+++ b/Client/Views/MainWindow.xaml.cs
@@ -32,8 +32,6 @@ namespace Client

        private void Button_Click(object sender, RoutedEventArgs e)
        {
-
-            
        }
    }
 }