From 357121bad56058941b1f70327a2acbb4e53d5aa6 Mon Sep 17 00:00:00 2001
From: Andrew Erickson <aerickson14@gmail.com>
Date: Fri, 30 Apr 2021 20:15:54 -0600
Subject: [PATCH] fix branch conflicts

---
 Xcodes/Backend/AppState.swift                           | 2 +-
 Xcodes/Frontend/Preferences/GeneralPreferencePane.swift | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Xcodes/Backend/AppState.swift b/Xcodes/Backend/AppState.swift
index c5641a6..a9483c9 100644
--- a/Xcodes/Backend/AppState.swift
+++ b/Xcodes/Backend/AppState.swift
@@ -112,7 +112,7 @@ class AppState: ObservableObject {
         validateSession()
             .catch { (error) -> AnyPublisher<Void, Error> in
                 guard
-                    let username = savedUsername,
+                    let username = self.savedUsername,
                     let password = try? Current.keychain.getString(username)
                 else {
                     return Fail(error: error) 
diff --git a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift
index 8cd710b..19af99a 100644
--- a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift
+++ b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift
@@ -19,13 +19,6 @@ struct GeneralPreferencePane: View {
                 }
             }
             .groupBoxStyle(PreferencesGroupBoxStyle())
-            
-            Divider()
-            
-            GroupBox(label: Text("Notifications")) {
-                NotificationsView().environmentObject(appState)
-            }
-            .groupBoxStyle(PreferencesGroupBoxStyle())
         }
         .frame(width: 400)
     }