From 7f91ce8067a73e8af137f0894256056307409e1f Mon Sep 17 00:00:00 2001 From: Denis Isaev Date: Sun, 9 Jun 2019 13:22:03 +0300 Subject: [PATCH] fix conflict in go.mod after merging #555 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c2486e95..dec5e3dc 100644 --- a/go.mod +++ b/go.mod @@ -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