diff options
Diffstat (limited to 'ui/app/accounts')
| -rw-r--r-- | ui/app/accounts/account-panel.js | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ui/app/accounts/account-panel.js b/ui/app/accounts/account-panel.js index 1c9e84414..af3d0d347 100644 --- a/ui/app/accounts/account-panel.js +++ b/ui/app/accounts/account-panel.js @@ -67,12 +67,6 @@ NewComponent.prototype.render = function () { event.preventDefault() copyToClipboard(ethUtil.toChecksumAddress(identity.address)) }, -<<<<<<< HEAD - style:{ - margin: '0px 5px', - }, -======= ->>>>>>> master }), ]), ]) |