Skip to content

Commit

Permalink
Further merge fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
gertjaap committed Mar 4, 2019
1 parent 8aec7f4 commit b226635
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
2 changes: 0 additions & 2 deletions react-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ import (
"fmt"
"math/big"
"sort"
"strings"

"github.com/adiabat/bech32"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/gertjaap/vertcoin-openassets/ecies"
"github.com/gertjaap/vertcoin-extras/ecies"
)

func KeyHashFromPkScript(pkscript []byte) []byte {
Expand Down
2 changes: 1 addition & 1 deletion wallet/stealth.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/gertjaap/vertcoin-openassets/util"
"github.com/gertjaap/vertcoin-extras/util"
"github.com/mit-dci/lit/lnutil"
"github.com/tidwall/buntdb"
)
Expand Down

0 comments on commit b226635

Please sign in to comment.