diff options
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 { |