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 Dec 19, 2023
1 parent 3516541 commit e50d172
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 @@ -8,7 +8,7 @@ require (
github.com/google/uuid v1.3.1
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.11.2
github.com/networkservicemesh/govpp v0.0.0-20231212083525-5ecb386aa377
github.com/networkservicemesh/govpp v0.0.0-20231216233431-9c82b2963820
github.com/networkservicemesh/sdk v1.11.2
github.com/networkservicemesh/sdk-kernel v1.11.2
github.com/networkservicemesh/sdk-vpp v0.0.0-20231219113915-17a28f185413
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN
github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
github.com/networkservicemesh/api v1.11.2 h1:91KPORtfbxuXf67eNZiP2LsNfbDFUa+QckWhSiMDhB8=
github.com/networkservicemesh/api v1.11.2/go.mod h1:E2yBac48+mMkMh6ODnsNyah4EE6rI08SMR9n+86Emxs=
github.com/networkservicemesh/govpp v0.0.0-20231212083525-5ecb386aa377 h1:jL/ALtHGRwHbcFsKBcbvaVtdHwP6GtpYJOr+vknn/9c=
github.com/networkservicemesh/govpp v0.0.0-20231212083525-5ecb386aa377/go.mod h1:qsoLtPgOdSCTBUFOhS3jAdZkk1u4URf55akKOHn4f34=
github.com/networkservicemesh/govpp v0.0.0-20231216233431-9c82b2963820 h1:Ok6qAWAfhEi3iIgWbd4h1bUH/gpdyI/vZP5faVvnP5E=
github.com/networkservicemesh/govpp v0.0.0-20231216233431-9c82b2963820/go.mod h1:qsoLtPgOdSCTBUFOhS3jAdZkk1u4URf55akKOHn4f34=
github.com/networkservicemesh/sdk v1.11.2 h1:HHhA6vjbyVEDffcx2vUuc1/kHqBuTmTJrxbadul9mak=
github.com/networkservicemesh/sdk v1.11.2/go.mod h1:9B6CU54HGgkBQ8d1rQH18HzAMr7kGWNMoYdVARYAkGQ=
github.com/networkservicemesh/sdk-kernel v1.11.2 h1:txgWevJoaBInZC5cYGZVSpltoBrd2wswsidi7h6QDAM=
Expand Down

0 comments on commit e50d172

Please sign in to comment.