m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

fix merge

Browse Source
This commit is contained in:
Frances Pangilinan 2016-12-21 14:46:10 -08:00
parent 6f7c23fd28
commit 9e1c90eafc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/metamask-controller.js
View File

@ -64,7 +64,7 @@ module.exports = class MetamaskController {
this.ethStore.getState(), this.ethStore.getState(),
this.configManager.getConfig(), this.configManager.getConfig(),
this.keyringController.getState(), this.keyringController.getState(),
this.txManager.getState() this.txManager.getState(),
this.noticeController.getState() this.noticeController.getState()
) )
} }