diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-08-11 04:51:14 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-08-11 05:41:40 +0800 |
| commit | 4ace425a9c4a5112692d1e9269d3074a0987e5e9 (patch) | |
| tree | 58abb6170e9e21dbf6b0bb09355ff93404a22901 /ui/app/account-detail.js | |
| parent | ba1edc429b948962fe0f03ef43588f7945cea3f2 (diff) | |
| download | tangerine-wallet-browser-4ace425a9c4a5112692d1e9269d3074a0987e5e9.tar tangerine-wallet-browser-4ace425a9c4a5112692d1e9269d3074a0987e5e9.tar.gz tangerine-wallet-browser-4ace425a9c4a5112692d1e9269d3074a0987e5e9.tar.bz2 tangerine-wallet-browser-4ace425a9c4a5112692d1e9269d3074a0987e5e9.tar.lz tangerine-wallet-browser-4ace425a9c4a5112692d1e9269d3074a0987e5e9.tar.xz tangerine-wallet-browser-4ace425a9c4a5112692d1e9269d3074a0987e5e9.tar.zst tangerine-wallet-browser-4ace425a9c4a5112692d1e9269d3074a0987e5e9.zip | |
Fix merge mess
Diffstat (limited to 'ui/app/account-detail.js')
| -rw-r--r-- | ui/app/account-detail.js | 8 |
1 files changed, 0 insertions, 8 deletions
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()), |