fix 冲突

This commit is contained in:
silenceper committed 2020-05-23 12:23:55 +08:00
commit 165d8f4d96
6 files changed
+92 -18

No files matched your search

+1 -3
View File
@@ -4,9 +4,7 @@ go 1.14
require (
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gomodule/redigo v1.8.1
github.com/kr/pretty v0.1.0 // indirect
github.com/sirupsen/logrus v1.6.0
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
)