diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-09-28 13:32:07 +0800 |
|---|---|---|
| committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-09-28 13:32:07 +0800 |
| commit | 5a1d50cd431819874f634679a1ea47fa64f9fbb4 (patch) | |
| tree | fe76102102c875ee6eaaee8cb57829899936c519 /app/scripts/migrations/_multi-keyring.js | |
| parent | deee689426f0b6236093128b47be81faf56d6b75 (diff) | |
| parent | cdf41c28573822c7c4d50efe7dfa34a062825d7f (diff) | |
| download | tangerine-wallet-browser-5a1d50cd431819874f634679a1ea47fa64f9fbb4.tar tangerine-wallet-browser-5a1d50cd431819874f634679a1ea47fa64f9fbb4.tar.gz tangerine-wallet-browser-5a1d50cd431819874f634679a1ea47fa64f9fbb4.tar.bz2 tangerine-wallet-browser-5a1d50cd431819874f634679a1ea47fa64f9fbb4.tar.lz tangerine-wallet-browser-5a1d50cd431819874f634679a1ea47fa64f9fbb4.tar.xz tangerine-wallet-browser-5a1d50cd431819874f634679a1ea47fa64f9fbb4.tar.zst tangerine-wallet-browser-5a1d50cd431819874f634679a1ea47fa64f9fbb4.zip | |
Merge branch 'master' into mmn
Diffstat (limited to 'app/scripts/migrations/_multi-keyring.js')
| -rw-r--r-- | app/scripts/migrations/_multi-keyring.js | 2 |
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' |