AccountStore: Fixing merge issue

jleandroperez · jleandroperez · commit 15cd44388392 · 2018-07-10T12:44:23.000-03:00
diff --git a/Yosemite/Yosemite/Stores/AccountStore.swift b/Yosemite/Yosemite/Stores/AccountStore.swift
@@ -73,7 +73,7 @@ private extension AccountStore {
     /// Loads the Account associated with the specified userID (if any!).
     ///
     func loadAccount(userID: Int, onCompletion: @escaping (Account?) -> Void) {
-        let account = loadStoredAccount(userId: userID)?.toReadOnly()
+        let account = storageManager.viewStorage.loadAccount(userId: userID)?.toReadOnly()
         onCompletion(account)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ private extension AccountStore {`
`73`	`73`	`/// Loads the Account associated with the specified userID (if any!).`
`74`	`74`	`///`
`75`	`75`	`func loadAccount(userID: Int, onCompletion: @escaping (Account?) -> Void) {`
`76`		`- let account = loadStoredAccount(userId: userID)?.toReadOnly()`
	`76`	`+ let account = storageManager.viewStorage.loadAccount(userId: userID)?.toReadOnly()`
`77`	`77`	`onCompletion(account)`
`78`	`78`	`}`
`79`	`79`	`}`