fix conflict in go.mod after merging #555

This commit is contained in:
Denis Isaev 2019-06-09 13:22:03 +03:00
parent 88318cb0e2
commit 7f91ce8067
No known key found for this signature in database
GPG Key ID: A36A0EC8E27A1A01

2
go.mod
View File

@ -49,8 +49,8 @@ require (
github.com/spf13/pflag v1.0.1
github.com/spf13/viper v1.0.2
github.com/stretchr/testify v1.2.2
github.com/valyala/quicktemplate v1.1.1
github.com/timakin/bodyclose v0.0.0-20190407043127-4a873e97b2bb
github.com/valyala/quicktemplate v1.1.1
golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a // indirect
golang.org/x/net v0.0.0-20190313220215-9f648a60d977 // indirect
golang.org/x/sys v0.0.0-20190312061237-fead79001313 // indirect