merge: resolve conflicts with main (go.mod, go.sum)
1 file · +3 -3
M go.mod +3 -3
| @@ -7,16 +7,16 @@ require ( | |||
| 7 | 7 | github.com/docker/docker v28.3.3+incompatible | |
| 8 | 8 | github.com/docker/go-connections v0.5.0 | |
| 9 | 9 | github.com/google/uuid v1.6.0 | |
| 10 | - | github.com/rs/zerolog v1.34.0 | |
| 11 | 10 | github.com/spf13/cobra v1.10.2 | |
| 12 | 11 | github.com/spf13/viper v1.21.0 | |
| 13 | 12 | github.com/stretchr/testify v1.11.1 | |
| 14 | - | gopkg.in/natefinch/lumberjack.v2 v2.2.1 | |
| 15 | 13 | ) | |
| 16 | 14 | ||
| 17 | 15 | require ( | |
| 18 | 16 | github.com/cespare/xxhash/v2 v2.3.0 // indirect | |
| 17 | + | github.com/rs/zerolog v1.34.0 // indirect | |
| 19 | 18 | go.yaml.in/yaml/v3 v3.0.4 // indirect | |
| 19 | + | gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect | |
| 20 | 20 | ) | |
| 21 | 21 | ||
| 22 | 22 | require ( | |
| @@ -29,7 +29,7 @@ require ( | |||
| 29 | 29 | ||
| 30 | 30 | require ( | |
| 31 | 31 | github.com/Microsoft/go-winio v0.4.14 // indirect | |
| 32 | - | github.com/containerd/errdefs v1.0.0 // indirect | |
| 32 | + | github.com/containerd/errdefs v1.0.0 | |
| 33 | 33 | github.com/containerd/errdefs/pkg v0.3.0 // indirect | |
| 34 | 34 | github.com/containerd/log v0.1.0 // indirect | |
| 35 | 35 | github.com/distribution/reference v0.6.0 // indirect | |
| @@ -7,16 +7,16 @@ require ( | |||||
| 7 | github.com/docker/docker v28.3.3+incompatible | 7 | github.com/docker/docker v28.3.3+incompatible | ||
| 8 | github.com/docker/go-connections v0.5.0 | 8 | github.com/docker/go-connections v0.5.0 | ||
| 9 | github.com/google/uuid v1.6.0 | 9 | github.com/google/uuid v1.6.0 | ||
| 10 | - | github.com/rs/zerolog v1.34.0 | |||
| 11 | github.com/spf13/cobra v1.10.2 | 10 | github.com/spf13/cobra v1.10.2 | ||
| 12 | github.com/spf13/viper v1.21.0 | 11 | github.com/spf13/viper v1.21.0 | ||
| 13 | github.com/stretchr/testify v1.11.1 | 12 | github.com/stretchr/testify v1.11.1 | ||
| 14 | - | gopkg.in/natefinch/lumberjack.v2 v2.2.1 | |||
| 15 | ) | 13 | ) | ||
| 16 | 14 | ||||
| 17 | require ( | 15 | require ( | ||
| 18 | github.com/cespare/xxhash/v2 v2.3.0 // indirect | 16 | github.com/cespare/xxhash/v2 v2.3.0 // indirect | ||
| 17 | + | github.com/rs/zerolog v1.34.0 // indirect | |||
| 19 | go.yaml.in/yaml/v3 v3.0.4 // indirect | 18 | go.yaml.in/yaml/v3 v3.0.4 // indirect | ||
| 19 | + | gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect | |||
| 20 | ) | 20 | ) | ||
| 21 | 21 | ||||
| 22 | require ( | 22 | require ( | ||
| @@ -29,7 +29,7 @@ require ( | |||||
| 29 | 29 | ||||
| 30 | require ( | 30 | require ( | ||
| 31 | github.com/Microsoft/go-winio v0.4.14 // indirect | 31 | github.com/Microsoft/go-winio v0.4.14 // indirect | ||
| 32 | - | github.com/containerd/errdefs v1.0.0 // indirect | 32 | + | github.com/containerd/errdefs v1.0.0 |
| 33 | github.com/containerd/errdefs/pkg v0.3.0 // indirect | 33 | github.com/containerd/errdefs/pkg v0.3.0 // indirect | ||
| 34 | github.com/containerd/log v0.1.0 // indirect | 34 | github.com/containerd/log v0.1.0 // indirect | ||
| 35 | github.com/distribution/reference v0.6.0 // indirect | 35 | github.com/distribution/reference v0.6.0 // indirect | ||