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 23, 2023
1 parent cfbc9c4 commit 931df05
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.6.2-0.20221205183940-84c7ff837cdd
github.com/networkservicemesh/sdk v0.5.1-0.20230123083201-661534af77d7
github.com/networkservicemesh/sdk-sriov v0.0.0-20230123085206-1baa83265e52
github.com/networkservicemesh/sdk-vpp v0.0.0-20230117144814-1372c19cdda3
github.com/networkservicemesh/sdk-vpp v0.0.0-20230123085221-c12d09687129
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 @@ -221,8 +221,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20230123083201-661534af77d7 h1:/1p9Cn
github.com/networkservicemesh/sdk v0.5.1-0.20230123083201-661534af77d7/go.mod h1:++MSpR2wuFlCpCYoR6lELxJ4ILKd650vDQ8d9CtGAzA=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230123085206-1baa83265e52 h1:cEFREWKidnCkcCPmPKmiztPrGKbS7ROKwdF4xbF9Xh0=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230123085206-1baa83265e52/go.mod h1:63rdciGoQjyf31dm1g7dMtsU7SxMjXXWEDUytMTB1bo=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230117144814-1372c19cdda3 h1:evfSBN20AR+CoJ+eHCbODMSycWRxsBNm1l50PEuon4A=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230117144814-1372c19cdda3/go.mod h1:F3Sx9nWsKAGwEWYIltDLRBKzu38JeVSW0/TASVeQW7U=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230123085221-c12d09687129 h1:K5SMXZJskKueg+CtCnuzqINk7R20bbdqI5sSJzNSy7E=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230123085221-c12d09687129/go.mod h1:dyHd/m176I5yG92+SN7RctqKC7FB06/alXiW3M/2JyU=
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 931df05

Please sign in to comment.