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 Jun 20, 2023
1 parent 14773c0 commit e8dda5d
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 @@ -12,7 +12,7 @@ require (
github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1
github.com/networkservicemesh/sdk v0.5.1-0.20230620142740-a8c394e69c4e
github.com/networkservicemesh/sdk-sriov v0.0.0-20230620143514-7a5d4745f6c6
github.com/networkservicemesh/sdk-vpp v0.0.0-20230619140952-19e1f393a812
github.com/networkservicemesh/sdk-vpp v0.0.0-20230620143804-f3806032520e
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
github.com/spiffe/go-spiffe/v2 v2.0.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20230620142740-a8c394e69c4e h1:Gd9eqX
github.com/networkservicemesh/sdk v0.5.1-0.20230620142740-a8c394e69c4e/go.mod h1:hmu0t7IxKa1v7Mj7Y3dQrcpRD0YtEyFE5vJorXRQT2A=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230620143514-7a5d4745f6c6 h1:BxdUbJVtRQet0w6t4rj918YEIqiNXp7vyojSAPHQT64=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230620143514-7a5d4745f6c6/go.mod h1:Mvik77CM1A3Kt6zWkfxEAPHGOTIbm5WHT99Fvv39z6I=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230619140952-19e1f393a812 h1:7sdZqGP13HL2gX75vPYaBWVgKzYvSyFGSaDEKI+7ky4=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230619140952-19e1f393a812/go.mod h1:Ftr6VMBw/nNGVed5UBfXiaTNUShhJZ1g51Nam3qlKVQ=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230620143804-f3806032520e h1:pD91JutqM4NLwOUldR+GS7n7VGm8iRHDQIUcqRJQFqY=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230620143804-f3806032520e/go.mod h1:97wTUBB0GBz59dThV8hlIlE/g/+I5RuSJehf5aauzEA=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.1.0 h1:e3YP4dN/HYPpGh29X1ZkcxcEICsOls9huyVCRBaxjq8=
github.com/onsi/gomega v1.1.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
Expand Down

0 comments on commit e8dda5d

Please sign in to comment.