fix merge conflicts

1 files changed, 2 insertions, 2 deletions

diff --git a/app/scripts/controllers/transactions/tx-state-manager.js b/app/scripts/controllers/transactions/tx-state-manager.js
index 62319507d..151082452 100644
--- a/app/scripts/controllers/transactions/tx-state-manager.js
+++ b/app/scripts/controllers/transactions/tx-state-manager.js
@@ -1,5 +1,5 @@
 const extend = require('xtend')
-const EventEmitter = require('events')
+const EventEmitter = require('safe-event-emitter')
 const ObservableStore = require('obs-store')
 const ethUtil = require('ethereumjs-util')
 const log = require('loglevel')
@@ -86,7 +86,7 @@ class TransactionStateManager extends EventEmitter {
     @returns {array} the tx list whos status is approved if no address is provide
     returns all txMetas who's status is approved for the current network
   */
-  getApprovedTransactions(address) {
+  getApprovedTransactions (address) {
     const opts = { status: 'approved' }
     if (address) opts.from = address
     return this.getFilteredTxList(opts)