Skip to content

Commit

Permalink
Automatically resolving conflicts in go.mod and updating dependency v…
Browse files Browse the repository at this point in the history
  • Loading branch information
nsmbot authored Dec 6, 2022
1 parent 1da2a04 commit 1075b74
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/sdk v0.5.1-0.20221124104929-d83bdbd65e5a
github.com/networkservicemesh/sdk-k8s v0.0.0-20221206233229-0bd1359737d9
github.com/networkservicemesh/sdk-k8s v0.0.0-20221206232124-a44ae6cddbad
github.com/onsi/gomega v1.20.1
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ github.com/networkservicemesh/api v1.6.2-0.20221123101008-30ff0ca88ee8 h1:243pLM
github.com/networkservicemesh/api v1.6.2-0.20221123101008-30ff0ca88ee8/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/sdk v0.5.1-0.20221124104929-d83bdbd65e5a h1:cVAxQKXaUyEmzoCwoXEUuQ+JGm3usGk26fUZta10xSY=
github.com/networkservicemesh/sdk v0.5.1-0.20221124104929-d83bdbd65e5a/go.mod h1:wnkxc0GGaktCa8MaL49AmRbT4QZl+CNv9xPdMHBOfjk=
github.com/networkservicemesh/sdk-k8s v0.0.0-20221206233229-0bd1359737d9 h1:OOhXQ1TbJS1AdA3K0+DUYwbTQdk4qdp+o547pYel9+4=
github.com/networkservicemesh/sdk-k8s v0.0.0-20221206233229-0bd1359737d9/go.mod h1:7NCgzyq/jJDPjwp3lMX86UYBso8XfGR9m5aEwXAXT8A=
github.com/networkservicemesh/sdk-k8s v0.0.0-20221206232124-a44ae6cddbad h1:SKmyh02HMl03c7LSIC0fhnXFWHHt0T9vgQjGzaVjwd0=
github.com/networkservicemesh/sdk-k8s v0.0.0-20221206232124-a44ae6cddbad/go.mod h1:iA8vTa5KxN0WZDMaGJBJFATl5QGlpjuv4R9rXgv+yhE=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
Expand Down

0 comments on commit 1075b74

Please sign in to comment.