diff options
| author | Frances Pangilinan <frankie.diamond@gmail.com> | 2016-12-22 06:46:10 +0800 |
|---|---|---|
| committer | Frances Pangilinan <frankie.diamond@gmail.com> | 2016-12-22 06:46:10 +0800 |
| commit | 9e1c90eafcace4ac67100ae0a567faba13f9e618 (patch) | |
| tree | 00a3c993803b88f7a9c9a7d7f60191708f39dda0 /app | |
| parent | 6f7c23fd28ef37ae51478b735c1f5888c97bbaf5 (diff) | |
| download | tangerine-wallet-browser-9e1c90eafcace4ac67100ae0a567faba13f9e618.tar tangerine-wallet-browser-9e1c90eafcace4ac67100ae0a567faba13f9e618.tar.gz tangerine-wallet-browser-9e1c90eafcace4ac67100ae0a567faba13f9e618.tar.bz2 tangerine-wallet-browser-9e1c90eafcace4ac67100ae0a567faba13f9e618.tar.lz tangerine-wallet-browser-9e1c90eafcace4ac67100ae0a567faba13f9e618.tar.xz tangerine-wallet-browser-9e1c90eafcace4ac67100ae0a567faba13f9e618.tar.zst tangerine-wallet-browser-9e1c90eafcace4ac67100ae0a567faba13f9e618.zip | |
fix merge
Diffstat (limited to 'app')
| -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 125753063..6aec825fe 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -64,7 +64,7 @@ module.exports = class MetamaskController { this.ethStore.getState(), this.configManager.getConfig(), this.keyringController.getState(), - this.txManager.getState() + this.txManager.getState(), this.noticeController.getState() ) } |