Merge cleanup.

This commit is contained in:
Jeremy Beker 2019-06-15 13:30:12 -04:00
parent baf14f7379
commit 029bcbda96
No known key found for this signature in database
GPG Key ID: CD5EE767A4A34FD0
6 changed files with 5 additions and 6 deletions

View File

@ -278,7 +278,6 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
switch credentials {
case .basic(let username, _):
default:
self.username = username
case .googleBasicLogin(let username, _):
self.username = username

@ -1 +1 @@
Subproject commit 97dc785d171c5ffa151d7df73135641da8f5bc17
Subproject commit 111690033354afc1cf57e37a326c344a0fe93b77

@ -1 +1 @@
Subproject commit c38a779de5f935c4d041e89066a0d15d490f3776
Subproject commit 7b44768308dc6970ee78470d0ea1e5287badc2bc

@ -1 +1 @@
Subproject commit 93b481897d84849345daa965bd8e11860c9422e7
Subproject commit f2be15379d64e2f660735219bcbd77f7a759b057

@ -1 +1 @@
Subproject commit b6cd62f04c90922dbc58f2907a8db6c33b96b50e
Subproject commit 350762104423aef963ca945d4388ca9d47f991ce

@ -1 +1 @@
Subproject commit 142cb8ccc491201e3de35c0b5d76d23d785f1978
Subproject commit 59685e50640cd4629294bf2c0d63193ffa4ccc74