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 Mar 17, 2023
1 parent 1676152 commit 7fdef4d
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/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1
github.com/networkservicemesh/sdk v0.5.1-0.20230317102643-1c6df670c572
github.com/networkservicemesh/sdk-sriov v0.0.0-20230228155259-da5f2ef417b6
github.com/networkservicemesh/sdk-sriov v0.0.0-20230317103432-0315caadd263
github.com/networkservicemesh/sdk-vpp v0.0.0-20230317103427-f6f943e7d5cb
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 @@ -221,8 +221,8 @@ github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1 h1:RxNKks
github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/sdk v0.5.1-0.20230317102643-1c6df670c572 h1:XygT2j2Eo9ISDXKAlVgVTvFNovLGCy3wztXnVb0uoLs=
github.com/networkservicemesh/sdk v0.5.1-0.20230317102643-1c6df670c572/go.mod h1:hmu0t7IxKa1v7Mj7Y3dQrcpRD0YtEyFE5vJorXRQT2A=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230228155259-da5f2ef417b6 h1:O2kU/A/FdAHzIrIXwsy4fE1u1sGMvrZQpmvfUBWxduY=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230228155259-da5f2ef417b6/go.mod h1:9mi2kPBi05/QHKrOcH02g7E50jCsJHgnAHBIDYTRL5w=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230317103432-0315caadd263 h1:AwaswNpuSc2T+eLKGK8DlO1hr4+Cs6LtPsSFCaLIySw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230317103432-0315caadd263/go.mod h1:lo33Di+2AKb1vhZHNV22TRcOZgu3UPtn+VL6zjQ2HMQ=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230317103427-f6f943e7d5cb h1:EweKOA8x/aFAFPvUCOJK4z4dGiZyyGOunr85j+Z6cyI=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230317103427-f6f943e7d5cb/go.mod h1:8DxTdZt1yn6BVlzPZkUfiCICkEEjFRRT758L8jv6jmA=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
Expand Down

0 comments on commit 7fdef4d

Please sign in to comment.