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/actions.js | |
| parent | ba1edc429b948962fe0f03ef43588f7945cea3f2 (diff) | |
| download | tangerine-wallet-browser-4ace425a9c4a5112692d1e9269d3074a0987e5e9.tar.gz tangerine-wallet-browser-4ace425a9c4a5112692d1e9269d3074a0987e5e9.tar.zst tangerine-wallet-browser-4ace425a9c4a5112692d1e9269d3074a0987e5e9.zip | |
Fix merge mess
Diffstat (limited to 'ui/app/actions.js')
| -rw-r--r-- | ui/app/actions.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index bdf100040..52c03f16f 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -624,7 +624,6 @@ function buyEth (address, amount) { }) } } -<<<<<<< HEAD function buyEthSubview () { return { |