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 Jun 16, 2022
1 parent 40aa173 commit a918ec8
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 @@ -6,7 +6,7 @@ require (
github.com/antonfisher/nested-logrus-formatter v1.3.1
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab
github.com/networkservicemesh/sdk v0.5.1-0.20220616114933-1bc512535563
github.com/networkservicemesh/sdk v0.5.1-0.20220616114448-82a3e5a510a6
github.com/sirupsen/logrus v1.8.1
github.com/spiffe/go-spiffe/v2 v2.0.0
google.golang.org/grpc v1.42.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab h1:hV6T7Kvze0qQphqi6g5ZKFoJ0m08OKdWETUINo3tuaA=
github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/sdk v0.5.1-0.20220616114933-1bc512535563 h1:jAW5V5Fo1Bvqfh09Iin4Xp7Ahf/41gyFMWJYcwr+oQI=
github.com/networkservicemesh/sdk v0.5.1-0.20220616114933-1bc512535563/go.mod h1:FdmGiefBBcj9HlV+poQSEAPOuBVp/hkwjWoDEN2a+jg=
github.com/networkservicemesh/sdk v0.5.1-0.20220616114448-82a3e5a510a6 h1:wcs5laU5iFMdWljb3RRPK0DGnQzdpZLZ/nyoqHHtsAY=
github.com/networkservicemesh/sdk v0.5.1-0.20220616114448-82a3e5a510a6/go.mod h1:FdmGiefBBcj9HlV+poQSEAPOuBVp/hkwjWoDEN2a+jg=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down

0 comments on commit a918ec8

Please sign in to comment.