aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/actions.js
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app/actions.js')
-rw-r--r--ui/app/actions.js1
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 {