Skip to content

Commit

Permalink
Merge commit '1603860e687caffe318cb3b5e30bb581b4258042'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
  • Loading branch information
zhiquan911 committed Jul 30, 2019
2 parents 11d4c99 + 1603860 commit 40a4824
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ go.sum
*.db
.idea
*.log
.vscode
10 changes: 4 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,16 @@ module github.com/blocktree/beam-adapter
go 1.12

require (
boscoin.io/sebak v0.0.0-20190213022301-8aa4d74daff1
github.com/asdine/storm v2.1.2+incompatible
github.com/assetsadapterstore/payexpress-adapter v1.0.0
github.com/astaxie/beego v1.11.1
github.com/blocktree/go-owcdrivers v1.0.16
github.com/blocktree/go-owcdrivers v1.0.16 // indirect
github.com/blocktree/go-owcrypt v1.0.1
github.com/blocktree/openwallet v1.4.3
github.com/google/uuid v1.1.1
github.com/imroc/req v0.2.3
github.com/mr-tron/base58 v1.1.1
github.com/prometheus/common v0.0.0-20190107103113-2998b132700a
github.com/kr/pretty v0.1.0 // indirect
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24
github.com/tidwall/gjson v1.2.1
golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
gopkg.in/urfave/cli.v1 v1.20.0
)

0 comments on commit 40a4824

Please sign in to comment.