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 Dec 11, 2023
1 parent ab03ced commit 03987d9
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 @@ -16,7 +16,7 @@ require (
github.com/networkservicemesh/govpp v0.0.0-20231108193829-2484aa7cd5d9
github.com/networkservicemesh/sdk v0.5.1-0.20231211110341-821b4bc2de91
github.com/networkservicemesh/sdk-k8s v0.0.0-20231211110818-49c901a36289
github.com/networkservicemesh/sdk-sriov v0.0.0-20231207152107-3a83be6603d8
github.com/networkservicemesh/sdk-sriov v0.0.0-20231211111038-f7546ded56c5
github.com/networkservicemesh/sdk-vpp v0.0.0-20231211111023-cc2f396d9bcc
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb
github.com/pkg/errors v0.9.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ github.com/networkservicemesh/sdk-k8s v0.0.0-20231211110818-49c901a36289 h1:wxW/
github.com/networkservicemesh/sdk-k8s v0.0.0-20231211110818-49c901a36289/go.mod h1:lxoPnWOjn02Gk6ZVzA1XnhV/DyrxLMCcpKbw1tHsBXw=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231211110647-72c826c90fa7 h1:34gqt7GWRO0fxvzRCEFGyOCEFMvAiOs19sHEJ/KAaaU=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231211110647-72c826c90fa7/go.mod h1:U0bMD7hjEudW+NyQddzjF38f0jkM5/Tjxb1QNveGi5g=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231207152107-3a83be6603d8 h1:sJu1Ul/BwjwpY7Fd8YT3dr3f5kfw79JpRYylLuSI9Fw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231207152107-3a83be6603d8/go.mod h1:3z2qsFq5pwsRLMxrCa3aqs7+l5NGzMlw12G0mJH/+mo=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231211111038-f7546ded56c5 h1:kZdGmG1CrtkHf2dI8NpMDDgXpQMPFpVcWWatt0uwwow=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231211111038-f7546ded56c5/go.mod h1:TZXaYtNrQMrK5FL3mafib1pKNlofOAYbK7ojGssmK3w=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231211111023-cc2f396d9bcc h1:SKcR+up443aLBMuCrZ8uVKhOr/Ir9Rqic8UThQZrcmI=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231211111023-cc2f396d9bcc/go.mod h1:/5Hy0C78fN58UEv2SC9f0HBiue77p9+E6lhvVihnPyQ=
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb h1:SETtZ12eYPkUGafW1DwGb8kSOR8O4OniSuZnqn2bOOw=
Expand Down

0 comments on commit 03987d9

Please sign in to comment.