aboutsummaryrefslogtreecommitdiffstats
path: root/console
diff options
context:
space:
mode:
authorGuillaume Ballet <gballet@gmail.com>2019-02-19 02:59:12 +0800
committerGuillaume Ballet <gballet@gmail.com>2019-04-08 19:19:37 +0800
commit7b230b7ef18391ded47caec65fae132490f6712d (patch)
tree5ba42946cfd6f7d17bbd5c8e7804e7965d21eaee /console
parenta900e80a89395d85aa5695759f389a4d7cd1b8ba (diff)
downloadgo-tangerine-7b230b7ef18391ded47caec65fae132490f6712d.tar
go-tangerine-7b230b7ef18391ded47caec65fae132490f6712d.tar.gz
go-tangerine-7b230b7ef18391ded47caec65fae132490f6712d.tar.bz2
go-tangerine-7b230b7ef18391ded47caec65fae132490f6712d.tar.lz
go-tangerine-7b230b7ef18391ded47caec65fae132490f6712d.tar.xz
go-tangerine-7b230b7ef18391ded47caec65fae132490f6712d.tar.zst
go-tangerine-7b230b7ef18391ded47caec65fae132490f6712d.zip
accounts/scwallet: rebase and update
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) {