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 Jul 11, 2022
1 parent c3fe6f8 commit 458b0cc
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 @@ -11,7 +11,7 @@ require (
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.4.1-0.20220711153918-a59689088578
github.com/networkservicemesh/sdk v0.5.1-0.20220711213025-454062d8cea6
github.com/networkservicemesh/sdk-sriov v0.0.0-20220706094448-fe3d3b740841
github.com/networkservicemesh/sdk-sriov v0.0.0-20220711214101-121e750cbe29
github.com/networkservicemesh/sdk-vpp v0.0.0-20220711213928-fc3a59d6943a
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ github.com/networkservicemesh/api v1.4.1-0.20220711153918-a59689088578 h1:2MZD6S
github.com/networkservicemesh/api v1.4.1-0.20220711153918-a59689088578/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/sdk v0.5.1-0.20220711213025-454062d8cea6 h1:wz6G5+rIqMZqGAII9DdSAuR1LzstTvMpxsaYnHyBjjg=
github.com/networkservicemesh/sdk v0.5.1-0.20220711213025-454062d8cea6/go.mod h1:BF31hkvYPBmpChr4XB2l9pFWK+ySvk2y2h7IdCwqt84=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220706094448-fe3d3b740841 h1:Mz1zJB1eu4ejPAAmaVxSK50cCIDFQbgKEJBRku5mBhk=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220706094448-fe3d3b740841/go.mod h1:ojUqb9JSiM/zHlqgiymNEOMimAwTJgofX/rRM6XeJcE=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220711214101-121e750cbe29 h1:rUz9IdWQ1XqnwUIqwQIDH2ARI4ggIYrTyvjJ6EHsvcw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220711214101-121e750cbe29/go.mod h1:ZVovR6hAlRJNAcOAXDH4ydC176mxiE+opUkZESYqvz4=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220711213928-fc3a59d6943a h1:ZwWR32glKZXhO/X280hWa8XR2FOVt2IsZ6cfF5j8vfk=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220711213928-fc3a59d6943a/go.mod h1:/Xd8ZjmduIF47UewZCrzGvr+rkk9AS7xCqqDjePK+Fc=
github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
Expand Down

0 comments on commit 458b0cc

Please sign in to comment.