diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2017-09-28 01:57:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 01:57:02 +0800 |
| commit | e72083f6e81f888f714125f7c050e777ea5c9bdd (patch) | |
| tree | 8177fb150ae254b838cabec028b3c5e08fbc951e /app/scripts/migrations/_multi-keyring.js | |
| parent | ff5e8746bee0d7461df02e7f2186ff7c90bfcb50 (diff) | |
| parent | ca0dff06f5d9283e57b452dcc7e85c31b248b8aa (diff) | |
| download | tangerine-wallet-browser-e72083f6e81f888f714125f7c050e777ea5c9bdd.tar tangerine-wallet-browser-e72083f6e81f888f714125f7c050e777ea5c9bdd.tar.gz tangerine-wallet-browser-e72083f6e81f888f714125f7c050e777ea5c9bdd.tar.bz2 tangerine-wallet-browser-e72083f6e81f888f714125f7c050e777ea5c9bdd.tar.lz tangerine-wallet-browser-e72083f6e81f888f714125f7c050e777ea5c9bdd.tar.xz tangerine-wallet-browser-e72083f6e81f888f714125f7c050e777ea5c9bdd.tar.zst tangerine-wallet-browser-e72083f6e81f888f714125f7c050e777ea5c9bdd.zip | |
Merge branch 'master' into filter-fixes-moar
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' |