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 Apr 11, 2024
1 parent 59dac41 commit b4ff403
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 @@ -9,7 +9,7 @@ require (
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.12.1-rc.1.0.20240325104451-92facbceb926
github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba
github.com/networkservicemesh/sdk v0.5.1-0.20240405103106-edee168c48df
github.com/networkservicemesh/sdk v0.5.1-0.20240411170628-889386da5699
github.com/networkservicemesh/sdk-sriov v0.0.0-20240405104034-4c48ca37f7ee
github.com/networkservicemesh/sdk-vpp v0.0.0-20240411170841-6b6d4026f3b8
github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ github.com/networkservicemesh/api v1.12.1-rc.1.0.20240325104451-92facbceb926 h1:
github.com/networkservicemesh/api v1.12.1-rc.1.0.20240325104451-92facbceb926/go.mod h1:B8FmS3XZ7NZY7ZEtdcNg2NHYppDHlr4kl4eecdZN9eI=
github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba h1:7B6X6N7rwJNpnfsUlBavxuZdYqTx8nAKwxVS/AkuX1o=
github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba/go.mod h1:CwikXQ3p/y3j6+HbQQWXKv0f4LPyUd2vKTiViG93qWA=
github.com/networkservicemesh/sdk v0.5.1-0.20240405103106-edee168c48df h1:+fmCda2GJVcrJqOL7O1ehB5TXcfNe3egs3RcQsBLx4U=
github.com/networkservicemesh/sdk v0.5.1-0.20240405103106-edee168c48df/go.mod h1:kSPLlf71rqB+4mAW8MHkrfWs9cMuQJP7RVkGqpHqKmY=
github.com/networkservicemesh/sdk v0.5.1-0.20240411170628-889386da5699 h1:yXC6eeQ1oNU7V5T1Dkyjehq+LdXcvYkQrKZVFTSdIf8=
github.com/networkservicemesh/sdk v0.5.1-0.20240411170628-889386da5699/go.mod h1:kSPLlf71rqB+4mAW8MHkrfWs9cMuQJP7RVkGqpHqKmY=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240405104034-4c48ca37f7ee h1:ZH7bi0OtkRn3hppoOQJPMyXFYlJCoSek9IflZt0Ji6M=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240405104034-4c48ca37f7ee/go.mod h1:sFqaWFGmo5bCcOSJX6XQrX3SW7Jq5I4ajT7kz/KCeLE=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240411170841-6b6d4026f3b8 h1:cA2cRgam7U8RY/rGvprigFokZEx5B2NETIubAS2pVQE=
Expand Down

0 comments on commit b4ff403

Please sign in to comment.