File tree Expand file tree Collapse file tree 2 files changed +11
-0
lines changed Expand file tree Collapse file tree 2 files changed +11
-0
lines changed Original file line number Diff line number Diff line change @@ -11,6 +11,10 @@ require (
1111 github.com/Shopify/toxiproxy v2.1.4+incompatible
1212 github.com/docker/docker v28.5.1+incompatible
1313 github.com/elastic/elastic-agent-client/v7 v7.17.2
14+ <<<<<<< HEAD
15+ =======
16+ github.com/elastic/elastic-agent-libs v0.24.2
17+ >>>>>>> b5ff898 (build(deps): bump github.com/elastic/elastic-agent-libs in /testing (#5717))
1418 github.com/elastic/fleet-server/pkg/api v0.0.0-00010101000000-000000000000
1519 github.com/elastic/fleet-server/v7 v7.0.0-00010101000000-000000000000
1620 github.com/stretchr/testify v1.11.1
Original file line number Diff line number Diff line change @@ -43,10 +43,17 @@ github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0o
4343github.com/ebitengine/purego v0.8.4 /go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ =
4444github.com/elastic/elastic-agent-client/v7 v7.17.2 h1:Cl2TeABqWZgW40t5fchGWT/sRk4MDDLWA0d8iHHOxLA =
4545github.com/elastic/elastic-agent-client/v7 v7.17.2 /go.mod h1:5irRFqp6HLqtu1S+OeY0jg8x7K6PLL+DW+PwVk1vJnk =
46+ <<<<<<< HEAD
4647github.com/elastic/elastic-agent-libs v0.24.1 h1:kFPpOG5mbdaGRRNXPb2KfEaR65Uoi8nsMbDOKA02/Go =
4748github.com/elastic/elastic-agent-libs v0.24.1 /go.mod h1:o/iXtbHYaojpG4BOY7Z3hFMQAgEoqq2owO17JPGpf3A =
4849github.com/elastic/go-sysinfo v1.15.0 h1:54pRFlAYUlVNQ2HbXzLVZlV+fxS7Eax49stzg95M4Xw =
4950github.com/elastic/go-sysinfo v1.15.0 /go.mod h1:jPSuTgXG+dhhh0GKIyI2Cso+w5lPJ5PvVqKlL8LV/Hk =
51+ =======
52+ github.com/elastic/elastic-agent-libs v0.24.2 h1:BM86jemZV/a2qL2DsQO+tNfGroh/9GzZYAFU7yMiSZU =
53+ github.com/elastic/elastic-agent-libs v0.24.2 /go.mod h1:o/iXtbHYaojpG4BOY7Z3hFMQAgEoqq2owO17JPGpf3A =
54+ github.com/elastic/go-sysinfo v1.15.1 h1:zBmTnFEXxIQ3iwcQuk7MzaUotmKRp3OabbbWM8TdzIQ =
55+ github.com/elastic/go-sysinfo v1.15.1 /go.mod h1:jPSuTgXG+dhhh0GKIyI2Cso+w5lPJ5PvVqKlL8LV/Hk =
56+ >>>>>>> b5ff898 (build(deps): bump github.com/elastic/elastic-agent-libs in /testing (#5717))
5057github.com/elastic/go-ucfg v0.8.8 h1:54KIF/2zFKfl0MzsSOCGOsZ3O2bnjFQJ0nDJcLhviyk =
5158github.com/elastic/go-ucfg v0.8.8 /go.mod h1:4E8mPOLSUV9hQ7sgLEJ4bvt0KhMuDJa8joDT2QGAEKA =
5259github.com/elastic/go-windows v1.0.2 h1:yoLLsAsV5cfg9FLhZ9EXZ2n2sQFKeDYrHenkcivY4vI =
You can’t perform that action at this time.
0 commit comments