Mergekonflikt von Sourcetree behoben

PrototypWPFHAG/MainWindow.xaml.cs

@@ -1,6 +1,4 @@
 using System.Data;
-using System.Runtime.InteropServices;
-using System.Security.Principal;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
@@ -25,14 +23,6 @@ public partial class MainWindow : MetroWindow
     public MainWindow()
     {
         InitializeComponent();
-<<<<<<< HEAD
-        //TestConnection();
-        //Console.ReadKey();
-
-    }
-
-    private static void TestConnection()
-=======
     }
 
     private void Window_Loaded(object sender, RoutedEventArgs e)
@@ -46,7 +36,6 @@ public partial class MainWindow : MetroWindow
     }
 
     private string ValidateUser(string username, string password)
->>>>>>> 1195250b98172d34b8c49b85a81c21d1f26cdbac
     {
         using (NpgsqlConnection con = GetConnection())
         {
@@ -79,15 +68,8 @@ public partial class MainWindow : MetroWindow
                 }
             }
         }
-<<<<<<< HEAD
-    }
-    private static NpgsqlConnection GetConnection()
-    {
-        return new NpgsqlConnection(@"Server=localhost;Port=7854;User Id=postgres;Database=postgres;");
-=======
 
         return "Erfolgreich";
->>>>>>> 1195250b98172d34b8c49b85a81c21d1f26cdbac
     }
 
     private void ShowPasswordButton_PreviewMouseDown(object sender, RoutedEventArgs e)