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 Jan 11, 2024
1 parent 67b533c commit acee2b4
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-20231225111845-22983cadafe7
github.com/networkservicemesh/sdk v1.11.2
github.com/networkservicemesh/sdk-sriov v0.0.0-20240111114146-db218b7357a1
github.com/networkservicemesh/sdk-vpp v0.0.0-20240111092647-0739c251f992
github.com/networkservicemesh/sdk-vpp v0.0.0-20240111114255-6f452c26d413
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb
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 @@ -149,8 +149,8 @@ github.com/networkservicemesh/sdk v1.11.2 h1:HHhA6vjbyVEDffcx2vUuc1/kHqBuTmTJrxb
github.com/networkservicemesh/sdk v1.11.2/go.mod h1:9B6CU54HGgkBQ8d1rQH18HzAMr7kGWNMoYdVARYAkGQ=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240111114146-db218b7357a1 h1:0fk/AAwDMCxC4KnP8FnmtF/j/hOvVVkPyws5xmfoLhw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240111114146-db218b7357a1/go.mod h1:CFwfnCgtjq+8QS/GgyyL1u5jjeDaLINUkZ6y70qaF94=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240111092647-0739c251f992 h1:BTXWkElJy0WG+pjIvHttkZcveYwze9/FjglkBCPpwDw=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240111092647-0739c251f992/go.mod h1:AMysKotx5Yi+f/xuvSkSfnndikKKscTMR63XWQwXStc=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240111114255-6f452c26d413 h1:xsqYQXZe7z93eQzY+BFanMnNO6GO/9g073IxYiZv9Gw=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240111114255-6f452c26d413/go.mod h1:SWUqLb0MAvG/AkqrmLZVmiK2TMpN4lgYfRdHVKPQqJQ=
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 acee2b4

Please sign in to comment.