From 4ace425a9c4a5112692d1e9269d3074a0987e5e9 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Wed, 10 Aug 2016 13:51:14 -0700
Subject: Fix merge mess

---
 ui/app/account-detail.js | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'ui/app/account-detail.js')

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 814d8bab0..cf65cbb7d 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -172,27 +172,19 @@ AccountDetailScreen.prototype.render = function () {
           }),
 
           h('button', {
-<<<<<<< HEAD
             onClick: this.buyButtonDeligator.bind(this),
-=======
-            onClick: () => props.dispatch(actions.buyEth(selected)),
->>>>>>> master
             style: {
               marginBottom: '20px',
               marginRight: '8px',
               position: 'absolute',
               left: '219px',
             },
-<<<<<<< HEAD
           }, props.accountDetail.subview === 'buyForm' ? [h('i.fa.fa-arrow-left', {
             style: {
               width: '22.641px',
               height: '14px',
             },
           })] : 'BUY'),
-=======
-          }, 'BUY'),
->>>>>>> master
 
           h('button', {
             onClick: () => props.dispatch(actions.showSendPage()),
-- 
cgit