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 15, 2023
1 parent 01fb11f commit 540e941
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/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-vpp v0.0.0-20231110201238-14b666f1ea52
github.com/networkservicemesh/sdk-vpp v0.0.0-20231115140556-e7c0a9f95366
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb
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 @@ -149,8 +149,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20231115135824-7e78948c1d57 h1:fgAvwH
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-vpp v0.0.0-20231110201238-14b666f1ea52 h1:OSODr0+AUbIPcmGDQ9uwb+9Goc6KWgMeOngUWL0ixJY=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231110201238-14b666f1ea52/go.mod h1:tqV0tz9TTdooqQgBzE5FO7sMfF7lHf0LL4ZidARW4M8=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231115140556-e7c0a9f95366 h1:P2EjK8iEI6lVJ33QLOWHLW1jBGLP7EAhS7KICYBug18=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231115140556-e7c0a9f95366/go.mod h1:oSVCiqwrpx3UKv9wTi32n8CHkVQaq1iuZgzZDE6AmzM=
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb h1:SETtZ12eYPkUGafW1DwGb8kSOR8O4OniSuZnqn2bOOw=
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb/go.mod h1:gHuTaUs1uFvyOY0Cy9DXvyAR2MtwmlPD2NTyYfr6kLc=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
Expand Down

0 comments on commit 540e941

Please sign in to comment.