PBG2H23ASA/HAG_BIB_Projekt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mergekonflikt von Sourcetree behoben

Browse Source
This commit is contained in:
Luis Sander 2025-04-09 10:27:04 +02:00
parent c6b6a2359c
commit e94dfb54e1
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PrototypWPFHAG/MainWindow.xaml.cs
View File

@ -1,6 +1,4 @@
using System.Data; using System.Data;
using System.Runtime.InteropServices;
using System.Security.Principal;
using System.Text; using System.Text;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
@ -25,14 +23,6 @@ public partial class MainWindow : MetroWindow
public MainWindow() public MainWindow()
{ {
InitializeComponent(); InitializeComponent();
<<<<<<< HEAD
//TestConnection();
//Console.ReadKey();
}
private static void TestConnection()
=======
} }
private void Window_Loaded(object sender, RoutedEventArgs e) private void Window_Loaded(object sender, RoutedEventArgs e)
@ -46,7 +36,6 @@ public partial class MainWindow : MetroWindow
} }
private string ValidateUser(string username, string password) private string ValidateUser(string username, string password)
>>>>>>> 1195250b98172d34b8c49b85a81c21d1f26cdbac
{ {
using (NpgsqlConnection con = GetConnection()) 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"; return "Erfolgreich";
>>>>>>> 1195250b98172d34b8c49b85a81c21d1f26cdbac
} }
private void ShowPasswordButton_PreviewMouseDown(object sender, RoutedEventArgs e) private void ShowPasswordButton_PreviewMouseDown(object sender, RoutedEventArgs e)