diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-01-06 03:18:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-06 03:18:13 +0800 |
| commit | 73ee0ae766485cb15b28fcf5dadd1035cc2ea842 (patch) | |
| tree | 23496c117bd4205f7799a51443b52f01d9c69a70 /app/scripts/metamask-controller.js | |
| parent | 7659f5894a76bb905529d7e5ea88a156d06373d2 (diff) | |
| parent | 70816d7cb0cf4850d03956801bb6d3ca04158f9f (diff) | |
| download | tangerine-wallet-browser-73ee0ae766485cb15b28fcf5dadd1035cc2ea842.tar tangerine-wallet-browser-73ee0ae766485cb15b28fcf5dadd1035cc2ea842.tar.gz tangerine-wallet-browser-73ee0ae766485cb15b28fcf5dadd1035cc2ea842.tar.bz2 tangerine-wallet-browser-73ee0ae766485cb15b28fcf5dadd1035cc2ea842.tar.lz tangerine-wallet-browser-73ee0ae766485cb15b28fcf5dadd1035cc2ea842.tar.xz tangerine-wallet-browser-73ee0ae766485cb15b28fcf5dadd1035cc2ea842.tar.zst tangerine-wallet-browser-73ee0ae766485cb15b28fcf5dadd1035cc2ea842.zip | |
Merge branch 'dev' into fixTxManager
Diffstat (limited to 'app/scripts/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 02e65bf10..961130dfd 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -1,5 +1,5 @@ const extend = require('xtend') -const EthStore = require('eth-store') +const EthStore = require('./lib/eth-store') const MetaMaskProvider = require('web3-provider-engine/zero.js') const KeyringController = require('./keyring-controller') const NoticeController = require('./notice-controller') |