sjs/gh-XcodesOrg-XcodesApp
1
0
Fork 0
mirror of https://github.com/XcodesOrg/XcodesApp.git synced 2026-03-25 08:55:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix branch conflicts

Browse source
This commit is contained in:
Andrew Erickson 2021-04-30 20:15:54 -06:00
parent cafa7baf1f
commit 357121bad5
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Xcodes/Backend/AppState.swift
View file

@ -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)

7
Xcodes/Frontend/Preferences/GeneralPreferencePane.swift
View file

@ -19,13 +19,6 @@ struct GeneralPreferencePane: View {
}
}
.groupBoxStyle(PreferencesGroupBoxStyle())
Divider()
GroupBox(label: Text("Notifications")) {
NotificationsView().environmentObject(appState)
}
.groupBoxStyle(PreferencesGroupBoxStyle())
}
.frame(width: 400)
}