mirror of
https://github.com/bitwarden/browser.git
synced 2025-01-06 18:57:56 +01:00
fix merge issues
This commit is contained in:
parent
e789d6ec70
commit
89120532b2
@ -37,7 +37,7 @@ export class DeviceTrustCryptoService implements DeviceTrustCryptoServiceAbstrac
|
||||
|
||||
async trustDevice(): Promise<DeviceResponse> {
|
||||
// Attempt to get user key
|
||||
const userKey: UserKey = await this.cryptoService.getUserKeyFromMemory();
|
||||
const userKey: UserKey = await this.cryptoService.getUserKey();
|
||||
|
||||
// If user key is not found, throw error
|
||||
if (!userKey) {
|
||||
|
Loading…
Reference in New Issue
Block a user