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 Nov 18, 2023
1 parent 7c29232 commit b22d0e9
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 @@ -10,7 +10,7 @@ require (
github.com/networkservicemesh/api v1.11.1-0.20231031152153-730abd666985
github.com/networkservicemesh/govpp v0.0.0-20231108193829-2484aa7cd5d9
github.com/networkservicemesh/sdk v0.5.1-0.20231115135824-7e78948c1d57
github.com/networkservicemesh/sdk-sriov v0.0.0-20231115140431-9c748414f267
github.com/networkservicemesh/sdk-sriov v0.0.0-20231118135313-cfcb50fbf019
github.com/networkservicemesh/sdk-vpp v0.0.0-20231118135429-59cf35e78ca0
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb
github.com/pkg/errors v0.9.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ github.com/networkservicemesh/govpp v0.0.0-20231108193829-2484aa7cd5d9 h1:f6WdRq
github.com/networkservicemesh/govpp v0.0.0-20231108193829-2484aa7cd5d9/go.mod h1:uTpdzM7rhTAJG86sjt3dQcHVABUgohuZCAyGWX5Rfmo=
github.com/networkservicemesh/sdk v0.5.1-0.20231115135824-7e78948c1d57 h1:fgAvwHchbdxQZTEbaeQBsz260uCCs2tZCET9F0q6zvI=
github.com/networkservicemesh/sdk v0.5.1-0.20231115135824-7e78948c1d57/go.mod h1:t0gOsubf+efkL9Ncy3+PvVKfr/xMGP0tA8HlFFJYz/s=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231115140431-9c748414f267 h1:6UEpKbSpmcMPpVQR3XJ5B96eC8qeidftgFYE9SLi678=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231115140431-9c748414f267/go.mod h1:2U4wk6sId5xP/6hhjZs5iahjG1cUrlUjhZMuugBTYnc=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231118135313-cfcb50fbf019 h1:nbPcHZicNh/S3/2RL2mBgdm/5+8SysIiShS/qf7qBrs=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231118135313-cfcb50fbf019/go.mod h1:JSK2De6OYp9pqiW+SqsbXxY/z53/3AziovPEhaVLn+M=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231118135429-59cf35e78ca0 h1:doxF3Nya2Dmi2KiXS4UD4kV2OA1RXhcd4CezY4z7IPw=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231118135429-59cf35e78ca0/go.mod h1:lCnoSmq49zEb+hz66n1qEvTHtHDNE8jEBdmtlXo+yQo=
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb h1:SETtZ12eYPkUGafW1DwGb8kSOR8O4OniSuZnqn2bOOw=
Expand Down

0 comments on commit b22d0e9

Please sign in to comment.