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 4, 2024
1 parent 047b594 commit 1e5c343
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-20240328101142-8a444680fbba
github.com/networkservicemesh/sdk v0.5.1-0.20240404173808-77fc1533d314
github.com/networkservicemesh/sdk-sriov v0.0.0-20240404174829-8b7672bd61d4
github.com/networkservicemesh/sdk-vpp v0.0.0-20240402095832-0937af407f93
github.com/networkservicemesh/sdk-vpp v0.0.0-20240404174851-8be3665ca53a
github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240404173808-77fc1533d314 h1:+3EEn2
github.com/networkservicemesh/sdk v0.5.1-0.20240404173808-77fc1533d314/go.mod h1:kSPLlf71rqB+4mAW8MHkrfWs9cMuQJP7RVkGqpHqKmY=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240404174829-8b7672bd61d4 h1:1iwpF9ngum/22u3AR83FEVxdzNTY34B1cZe8fm+EX9c=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240404174829-8b7672bd61d4/go.mod h1:K9RJgkNjQs4r+N/moN6oPhqTyRAOBMIfm563Lj8TYhQ=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240402095832-0937af407f93 h1:B/kKbbhKgeZKMaRLT0OzHqOQD1CtVEutSA2KUWoodDk=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240402095832-0937af407f93/go.mod h1:shEtTHtpRsiKYoA7beWPTYHm/ntAwNCU1ebmC0we8bY=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240404174851-8be3665ca53a h1:ohNr4Fcw5hvxc3OZY7tEX/Dc1jS3AH2uIM8hA9LZIq0=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240404174851-8be3665ca53a/go.mod h1:7Yz3DMSBc4MvWv6ihFlH0SlU0siFx37RkPn/i90Z2+w=
github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI=
github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6/go.mod h1:n6+8PnoDvWj6WMryfU3J8HOCusgysFjQ0kGLfrcsDEM=
github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
Expand Down

0 comments on commit 1e5c343

Please sign in to comment.