diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-08-11 04:48:34 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-08-11 04:48:34 +0800 |
| commit | ba1edc429b948962fe0f03ef43588f7945cea3f2 (patch) | |
| tree | eda1b54a424c2fc06ef151763b5cb57d2e838116 /ui/app/actions.js | |
| parent | 9c6dd9ef4953f6e421feb6e6684ef43da26f6b75 (diff) | |
| parent | c48b60d7a6f14d2d2348be8d9a63965ca1267433 (diff) | |
| download | tangerine-wallet-browser-ba1edc429b948962fe0f03ef43588f7945cea3f2.tar.gz tangerine-wallet-browser-ba1edc429b948962fe0f03ef43588f7945cea3f2.tar.zst tangerine-wallet-browser-ba1edc429b948962fe0f03ef43588f7945cea3f2.zip | |
Merge branch 'master' into buyForm
Diffstat (limited to 'ui/app/actions.js')
| -rw-r--r-- | ui/app/actions.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index 754ffced8..bdf100040 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -131,7 +131,6 @@ var actions = { showSubLoadingIndication: showSubLoadingIndication, HIDE_SUB_LOADING_INDICATION: 'HIDE_SUB_LOADING_INDICATION', hideSubLoadingIndication: hideSubLoadingIndication, - } module.exports = actions @@ -625,6 +624,7 @@ function buyEth (address, amount) { }) } } +<<<<<<< HEAD function buyEthSubview () { return { |