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 Sep 18, 2023
1 parent 1d5c820 commit d92d8cd
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-20230907103511-c36dcfff5b20
github.com/networkservicemesh/sdk v0.5.1-0.20230915092224-d68a6f4ada08
github.com/networkservicemesh/sdk-sriov v0.0.0-20230918051046-c7721596ebad
github.com/networkservicemesh/sdk-vpp v0.0.0-20230915092124-8a47f25f1d3f
github.com/networkservicemesh/sdk-vpp v0.0.0-20230918051204-11a7f0417055
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 @@ -230,8 +230,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20230915092224-d68a6f4ada08 h1:Lj5T68
github.com/networkservicemesh/sdk v0.5.1-0.20230915092224-d68a6f4ada08/go.mod h1:WrQdP/NEx+2knCVIL0X/dlAkg4y/RFvcXBhRwcz5M2Q=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230918051046-c7721596ebad h1:SaEMZUJUqM9SlwHt8cqdyqoS7XlPaVulRlxaYWWWnN8=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230918051046-c7721596ebad/go.mod h1:7G3vBz0P9YzDZFurDzPaCh2a+/80H5QVATBcEKk7r7I=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230915092124-8a47f25f1d3f h1:IK5l68zee6pIhXqWAkV1lurcc4BgK6iMlHgWXGNemok=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230915092124-8a47f25f1d3f/go.mod h1:F4wMvh1LhJKR24AZ/MWVguxsZJqIQpdeypYVebw6FI0=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230918051204-11a7f0417055 h1:qij0qL5C8idTbI8RpMRk7cOtIYoGTzPUi4njqIwVnJw=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230918051204-11a7f0417055/go.mod h1:iCVV/HJoMLNGWnF4RHby8y7vN84/CXR8a4wrN23YzLo=
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 d92d8cd

Please sign in to comment.