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 25, 2023
1 parent 8943fdd commit 9873603
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/networkservicemesh/govpp v0.0.0-20231216233431-9c82b2963820
github.com/networkservicemesh/sdk v1.11.2
github.com/networkservicemesh/sdk-sriov v0.0.0-20231225110656-ac9cb42fc03f
github.com/networkservicemesh/sdk-vpp v0.0.0-20231221130128-09fbd443c0a6
github.com/networkservicemesh/sdk-vpp v0.0.0-20231225110709-5148f539e557
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ github.com/networkservicemesh/sdk v1.11.2 h1:HHhA6vjbyVEDffcx2vUuc1/kHqBuTmTJrxb
github.com/networkservicemesh/sdk v1.11.2/go.mod h1:9B6CU54HGgkBQ8d1rQH18HzAMr7kGWNMoYdVARYAkGQ=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231225110656-ac9cb42fc03f h1:t9SRnuWcXmY6kiz1huCOlYoCOLTFUxKZRYuMfIrP0PQ=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231225110656-ac9cb42fc03f/go.mod h1:xRo3c0JqzwDKNtkRQJ4XWbcUjArEvUAoy03BgfC+jBc=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231221130128-09fbd443c0a6 h1:3lF7ZXt+rGhOoIg1CAADzNAIMB9Jkemn3TGcAIOXOJU=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231221130128-09fbd443c0a6/go.mod h1:I7K+3kdvLX4La0L0OxQ9KSEP9AgM9KjJCcygwNR3YwM=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231225110709-5148f539e557 h1:I6aY62DEa3HnYYcXJPorT15BZYWreJp8PbyqyYFC4H8=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231225110709-5148f539e557/go.mod h1:yVqWTGQR0Q6SQS5KFUV7q1rSw5fTeBkFM9yI4471PLI=
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb h1:SETtZ12eYPkUGafW1DwGb8kSOR8O4OniSuZnqn2bOOw=
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb/go.mod h1:gHuTaUs1uFvyOY0Cy9DXvyAR2MtwmlPD2NTyYfr6kLc=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
Expand Down

0 comments on commit 9873603

Please sign in to comment.