From d2812d23f974a0f3f16f074f6d826ed6ad8d046a Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Wed, 4 Jan 2017 15:47:29 -0800 Subject: [PATCH] fix merge failure --- cmd/sweepaccount/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/sweepaccount/main.go b/cmd/sweepaccount/main.go index f21f4e5..f7897be 100644 --- a/cmd/sweepaccount/main.go +++ b/cmd/sweepaccount/main.go @@ -21,6 +21,7 @@ import ( "github.com/btcsuite/golangcrypto/ssh/terminal" "github.com/jessevdk/go-flags" "github.com/roasbeef/btcwallet/internal/cfgutil" + "golang.org/x/crypto/ssh/terminal" ) var (