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 Nov 24, 2023
1 parent d943993 commit 4d77dc3
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 @@ -5,7 +5,7 @@ go 1.20
require (
github.com/kelseyhightower/envconfig v1.4.0
github.com/labstack/echo/v4 v4.6.1
github.com/networkservicemesh/sdk v0.5.1-0.20231124092826-4d02ed414eed
github.com/networkservicemesh/sdk v0.5.1-0.20231123111633-d10933795bd9
github.com/networkservicemesh/sdk-k8s v0.0.0-20231123112133-3a307c41ee71
go.uber.org/zap v1.19.0
gomodules.xyz/jsonpatch/v2 v2.1.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/networkservicemesh/api v1.11.1-0.20231031152153-730abd666985 h1:uiWxBSamqODTzO/uobmjjqWAhi93+bpIDQ+OpV3uU58=
github.com/networkservicemesh/api v1.11.1-0.20231031152153-730abd666985/go.mod h1:E2yBac48+mMkMh6ODnsNyah4EE6rI08SMR9n+86Emxs=
github.com/networkservicemesh/sdk v0.5.1-0.20231124092826-4d02ed414eed h1:D2K/dJxEeLMUtqbfsNi6BuWJ+WKwsYsqdVBm0XUn5dU=
github.com/networkservicemesh/sdk v0.5.1-0.20231124092826-4d02ed414eed/go.mod h1:t0gOsubf+efkL9Ncy3+PvVKfr/xMGP0tA8HlFFJYz/s=
github.com/networkservicemesh/sdk v0.5.1-0.20231123111633-d10933795bd9 h1:ScO0ypbucCB4m4oPGI/bFfu+AgDa7zC62V7Mc9YSPP4=
github.com/networkservicemesh/sdk v0.5.1-0.20231123111633-d10933795bd9/go.mod h1:t0gOsubf+efkL9Ncy3+PvVKfr/xMGP0tA8HlFFJYz/s=
github.com/networkservicemesh/sdk-k8s v0.0.0-20231123112133-3a307c41ee71 h1:jaxcApcevXQypvIZbUSMP/gdALpsc8AWDy1EpLnbP04=
github.com/networkservicemesh/sdk-k8s v0.0.0-20231123112133-3a307c41ee71/go.mod h1:Teu+YOp3uj3wW9hCYpM8tic/oEmLJOtRX0cKOKxIZwA=
github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE=
Expand Down

0 comments on commit 4d77dc3

Please sign in to comment.