Skip to content

Commit

Permalink
resolve PR #7 conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
woodyjon committed Apr 17, 2018
1 parent f3665c1 commit 35745d7
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions walletdmanager/walletdmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,6 @@ func GetPrivateViewKeyAndSpendKey() (privateViewKey string, privateSpendKey stri
// useRemoteNode is true if remote node, false if local
func StartWalletd(walletPath string, walletPassword string, useRemoteNode bool, daemonAddress string, daemonPort string) (err error) {

fileExtension := filepath.Ext(walletPath)
if fileExtension != ".wallet" {
return errors.New("filename should end with .wallet")
}

if isWalletdRunning(useRemoteNode) {
errorMessage := "Walletd or TurtleCoind is already running in the background.\nPlease close it via "

Expand Down

0 comments on commit 35745d7

Please sign in to comment.