Fix conflict

1 files changed, 4 insertions, 8 deletions

diff --git a/ui/app/components/pending-msg.js b/ui/app/components/pending-msg.js
index b0a6bb87d..7f3914d56 100644
--- a/ui/app/components/pending-msg.js
+++ b/ui/app/components/pending-msg.js
@@ -3,25 +3,21 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 
 const AccountPanel = require('./account-panel')
-const addressSummary = require('../util').addressSummary
 const readableDate = require('../util').readableDate
-const formatBalance = require('../util').formatBalance
-const dataSize = require('../util').dataSize
 
 module.exports = PendingMsg
 
-
 inherits(PendingMsg, Component)
-function PendingMsg() {
+function PendingMsg () {
   Component.call(this)
 }
 
-PendingMsg.prototype.render = function() {
+PendingMsg.prototype.render = function () {
   var state = this.props
   var msgData = state.txData
 
   var msgParams = msgData.msgParams || {}
-  var address =  msgParams.from || state.selectedAddress
+  var address = msgParams.from || state.selectedAddress
   var identity = state.identities[address] || { address: address }
   var account = state.accounts[address] || { address: address }
 
@@ -34,7 +30,7 @@ PendingMsg.prototype.render = function() {
         style: {
           fontWeight: 'bold',
           textAlign: 'center',
-        }
+        },
       }, 'Sign Message'),
 
       // account that will sign