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 71cf7f3 commit fbe4032
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 @@ -7,7 +7,7 @@ require (
github.com/edwarnicke/grpcfd v1.1.2
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.11.1-0.20231031152153-730abd666985
github.com/networkservicemesh/sdk v0.5.1-0.20231124092826-4d02ed414eed
github.com/networkservicemesh/sdk v0.5.1-0.20231123111633-d10933795bd9
github.com/networkservicemesh/sdk-sriov v0.0.0-20231123112303-056715838354
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 @@ -111,8 +111,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfr
github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
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-sriov v0.0.0-20231123112303-056715838354 h1:41RhH0tPb/CUt0fL6xvAVFK2L9MZ7zZQUFfna3cR4U4=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231123112303-056715838354/go.mod h1:RQ41Tz2rKIrw14FoiiPJVJLnsQ3Z2KWSYaYw6UUjJyo=
github.com/open-policy-agent/opa v0.44.0 h1:sEZthsrWBqIN+ShTMJ0Hcz6a3GkYsY4FaB2S/ou2hZk=
Expand Down

0 comments on commit fbe4032

Please sign in to comment.