aboutsummaryrefslogtreecommitdiffstats
path: root/console
diff options
context:
space:
mode:
Diffstat (limited to 'console')
-rw-r--r--console/bridge.go1
1 files changed, 0 insertions, 1 deletions
diff --git a/console/bridge.go b/console/bridge.go
index e90991dc6..b022a465d 100644
--- a/console/bridge.go
+++ b/console/bridge.go
@@ -175,7 +175,6 @@ func (b *bridge) OpenWallet(call otto.FunctionCall) (response otto.Value) {
throwJSException(err.Error())
}
return val
->>>>>>> accounts/scwallet, console: user friendly card opening
}
func (b *bridge) readPassphraseAndReopenWallet(call otto.FunctionCall) (otto.Value, error) {