aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/migrations/_multi-keyring.js
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-10-03 06:23:27 +0800
committerGitHub <noreply@github.com>2017-10-03 06:23:27 +0800
commit4b0e6a0a778efa24e6bbca1e9b60171606d46d2f (patch)
treeb5d338f9a9458a4cc3ff50abc0790823aac4b901 /app/scripts/migrations/_multi-keyring.js
parente998d528f0af71d1163bc89fe9e81195bb4f5dc3 (diff)
parentb7c195160238119291ce62b01db1c8f7e4f94568 (diff)
downloadtangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.tar
tangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.tar.gz
tangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.tar.bz2
tangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.tar.lz
tangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.tar.xz
tangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.tar.zst
tangerine-wallet-browser-4b0e6a0a778efa24e6bbca1e9b60171606d46d2f.zip
Merge branch 'master' into RemoveSlackLink
Diffstat (limited to 'app/scripts/migrations/_multi-keyring.js')
-rw-r--r--app/scripts/migrations/_multi-keyring.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/migrations/_multi-keyring.js b/app/scripts/migrations/_multi-keyring.js
index 253aa3d9d..7a4578ea7 100644
--- a/app/scripts/migrations/_multi-keyring.js
+++ b/app/scripts/migrations/_multi-keyring.js
@@ -10,7 +10,7 @@ which we dont have access to at the time of this writing.
const ObservableStore = require('obs-store')
const ConfigManager = require('../../app/scripts/lib/config-manager')
const IdentityStoreMigrator = require('../../app/scripts/lib/idStore-migrator')
-const KeyringController = require('../../app/scripts/lib/keyring-controller')
+const KeyringController = require('eth-keyring-controller')
const password = 'obviously not correct'