fix merge failure

This commit is contained in:
Olaoluwa Osuntokun 2017-01-04 15:47:29 -08:00
parent 2fb155724f
commit d2812d23f9

View file

@ -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 (