aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib/config-manager.js
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2016-12-24 04:48:36 +0800
committerFrankie <frankie.diamond@gmail.com>2016-12-24 04:48:36 +0800
commitfa3e708f34fce523601c39b3131bdbe858d2f85f (patch)
tree9cb3b8fb5622aa23d4856e21405f8939505d3271 /app/scripts/lib/config-manager.js
parentfde69ea0baf32b5d2a6932b73f4772e983aef552 (diff)
parent2ab34760b0e2e006c0b87722e8397c642eb86981 (diff)
downloadtangerine-wallet-browser-fa3e708f34fce523601c39b3131bdbe858d2f85f.tar
tangerine-wallet-browser-fa3e708f34fce523601c39b3131bdbe858d2f85f.tar.gz
tangerine-wallet-browser-fa3e708f34fce523601c39b3131bdbe858d2f85f.tar.bz2
tangerine-wallet-browser-fa3e708f34fce523601c39b3131bdbe858d2f85f.tar.lz
tangerine-wallet-browser-fa3e708f34fce523601c39b3131bdbe858d2f85f.tar.xz
tangerine-wallet-browser-fa3e708f34fce523601c39b3131bdbe858d2f85f.tar.zst
tangerine-wallet-browser-fa3e708f34fce523601c39b3131bdbe858d2f85f.zip
Merge branch 'dev' into TxManager
Diffstat (limited to 'app/scripts/lib/config-manager.js')
-rw-r--r--app/scripts/lib/config-manager.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index c723655fa..93501c859 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -118,7 +118,7 @@ ConfigManager.prototype.setVault = function (encryptedString) {
ConfigManager.prototype.getVault = function () {
var data = this.getData()
- return ('vault' in data) && data.vault
+ return data.vault
}
ConfigManager.prototype.getKeychains = function () {