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 Feb 7, 2023
1 parent 5e5336b commit d52a54d
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/api v1.7.2-0.20230123083145-4a6c3ec589e1
github.com/networkservicemesh/sdk v0.5.1-0.20230207140036-c1a6ac439d7f
github.com/networkservicemesh/sdk-k8s v0.0.0-20230206094406-f5f011a77765
github.com/networkservicemesh/sdk-sriov v0.0.0-20230127105629-a51dd9984613
github.com/networkservicemesh/sdk-sriov v0.0.0-20230207141212-27b319b3dfc4
github.com/networkservicemesh/sdk-vpp v0.0.0-20230207140956-bccaff74eb3b
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@ github.com/networkservicemesh/sdk-k8s v0.0.0-20230206094406-f5f011a77765 h1:WTAh
github.com/networkservicemesh/sdk-k8s v0.0.0-20230206094406-f5f011a77765/go.mod h1:CkjtfIS7hED8tf2YdifnbfEeS4ekPfV7IOdMvAFPiiQ=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230207140346-0af6111f80ca h1:LKNff+CrrZvwFrcZbub11IB7Ve3AcmD1IPLf7xtZbKQ=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230207140346-0af6111f80ca/go.mod h1:yugaz78kz0smacu2/3+fnCb6Fk+gaKQMaVuOsrg8G/0=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230127105629-a51dd9984613 h1:3tGK+20AnFeXFur4aqvBdCzIMWqi2/c7Ue7bILN0qZQ=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230127105629-a51dd9984613/go.mod h1:pzefGegBfdAt2bgOpM6LAhkB/nw+BQKkBx/qfjeTR28=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230207141212-27b319b3dfc4 h1:+R+Trqj1iEGbmxSMiYtAC5EruLMoi6n7nfWFQTz9KAw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230207141212-27b319b3dfc4/go.mod h1:ByO4Bnu7FtBhbWVmefYKy/9EWNKJvbFK9SMCt/GtYIY=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230207140956-bccaff74eb3b h1:wAiSpWWU31/copvLSwXsmFSI1XDn37EAgwFt73DIBzw=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230207140956-bccaff74eb3b/go.mod h1:Z0bT14AAOqTS6AmhH/xf9jW50w1jKMctA8Pm+tMuEKw=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
Expand Down

0 comments on commit d52a54d

Please sign in to comment.