accounts/scwallet: rebase and update

2019-02-18 19:59:12 +01:00
parent a900e80a89
commit 7b230b7ef1
2 changed files with 36 additions and 8 deletions
--- 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) {