Resolve merge conflicts

SkyTeam/MainWindow.xaml.cs

@@ -1,24 +1,14 @@
-using System.Text;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace SkyTeam
 {
-    /// <summary>
-    /// Interaction logic for MainWindow.xaml
-    /// </summary>
     public partial class MainWindow : Window
     {
         public MainWindow()
         {
             InitializeComponent();
+<<<<<<< HEAD
             TestDatabaseConnection();
         }
 
@@ -31,6 +21,19 @@ namespace SkyTeam
                 MessageBox.Show("Datenbank ist verfügbar!", "Erfolg", MessageBoxButton.OK, MessageBoxImage.Information);
             else
                 MessageBox.Show("Probleme mit der Verbindung.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+=======
+            ShowLoginPage();
+        }
+
+        private void ShowLoginPage()
+        {
+            MainFrame.Navigate(new LogInPage());
+        }
+        
+        public void NavigateToApp()
+        {
+            MainFrame.Navigate(new NavigationPage());
+>>>>>>> deaa68880afaf3dd53903180eef7a43c3e23056a
         }
     }
-}
+}