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 22, 2023
1 parent b6e32e8 commit 4f5366c
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.20231122111007-cb5a6d2a7a87
github.com/networkservicemesh/sdk-sriov v0.0.0-20231122111612-d0604b634b7c
github.com/networkservicemesh/sdk-vpp v0.0.0-20231121121029-0b038c4047f6
github.com/networkservicemesh/sdk-vpp v0.0.0-20231122111632-e932e1e7f850
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.20231122111007-cb5a6d2a7a87 h1:IKFkuJ
github.com/networkservicemesh/sdk v0.5.1-0.20231122111007-cb5a6d2a7a87/go.mod h1:t0gOsubf+efkL9Ncy3+PvVKfr/xMGP0tA8HlFFJYz/s=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231122111612-d0604b634b7c h1:+GyCJZP6VW6+MZBWJer6PIDLEVxaCQmHy9lGEPzHg0s=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231122111612-d0604b634b7c/go.mod h1:jiK9+vlU7XI0utwpytwTL3A9A02SH0tXePnocjUD2Ec=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231121121029-0b038c4047f6 h1:AmhnC6L4356oAAVmz6RbCcBwKLLlIHXR0cNmw3GPM6w=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231121121029-0b038c4047f6/go.mod h1:lCnoSmq49zEb+hz66n1qEvTHtHDNE8jEBdmtlXo+yQo=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231122111632-e932e1e7f850 h1:kCpJYRhrcNcwMW7p2LCG637XpXNOegnfliKqaRENxhw=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231122111632-e932e1e7f850/go.mod h1:sny/hPeb89X3+6BhKjQiJGc4ipEju4bNExkzAbVue9o=
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 4f5366c

Please sign in to comment.