From 9e1c90eafcace4ac67100ae0a567faba13f9e618 Mon Sep 17 00:00:00 2001
From: Frances Pangilinan <frankie.diamond@gmail.com>
Date: Wed, 21 Dec 2016 14:46:10 -0800
Subject: fix merge

---
 app/scripts/metamask-controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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()
     )
   }
-- 
cgit