diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-01-06 03:18:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-06 03:18:34 +0800 |
| commit | 00ac5ca058691c58d6401098c3d6905728f12e39 (patch) | |
| tree | 68e0208cba8f651eb548563217e6da5d947a05c6 /app/scripts/metamask-controller.js | |
| parent | e62f70660d922b0bf98e7595939f84821eff814a (diff) | |
| parent | 70816d7cb0cf4850d03956801bb6d3ca04158f9f (diff) | |
| download | tangerine-wallet-browser-00ac5ca058691c58d6401098c3d6905728f12e39.tar tangerine-wallet-browser-00ac5ca058691c58d6401098c3d6905728f12e39.tar.gz tangerine-wallet-browser-00ac5ca058691c58d6401098c3d6905728f12e39.tar.bz2 tangerine-wallet-browser-00ac5ca058691c58d6401098c3d6905728f12e39.tar.lz tangerine-wallet-browser-00ac5ca058691c58d6401098c3d6905728f12e39.tar.xz tangerine-wallet-browser-00ac5ca058691c58d6401098c3d6905728f12e39.tar.zst tangerine-wallet-browser-00ac5ca058691c58d6401098c3d6905728f12e39.zip | |
Merge branch 'dev' into TearDownOnDisconnect
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 2e5b02a7b..76ca99b25 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -1,6 +1,6 @@ const EventEmitter = require('events') 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') |