From b8ad58d1facf4e91720edeb10e0345bc85367123 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 29 Oct 2024 17:12:37 -0700 Subject: [PATCH] Fixing conflicts --- NOTICE.txt | 8 -------- go.mod | 4 ---- go.sum | 5 ----- 3 files changed, 17 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 7f8ababd3f..0483b8152f 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1264,19 +1264,11 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs -<<<<<<< HEAD -Version: v0.13.0 -Licence type (autodetected): Apache-2.0 --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.13.0/LICENSE: -======= Version: v0.15.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.15.0/LICENSE: ->>>>>>> bd29f19143 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#5873)) Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 45e7641b12..624f7137e8 100644 --- a/go.mod +++ b/go.mod @@ -14,11 +14,7 @@ require ( github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5 github.com/elastic/elastic-agent-autodiscover v0.9.0 github.com/elastic/elastic-agent-client/v7 v7.16.0 -<<<<<<< HEAD - github.com/elastic/elastic-agent-libs v0.13.0 -======= github.com/elastic/elastic-agent-libs v0.15.0 ->>>>>>> bd29f19143 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#5873)) github.com/elastic/elastic-agent-system-metrics v0.11.3 github.com/elastic/elastic-transport-go/v8 v8.6.0 github.com/elastic/go-elasticsearch/v8 v8.15.0 diff --git a/go.sum b/go.sum index 75c1d1954e..f0093e4410 100644 --- a/go.sum +++ b/go.sum @@ -264,13 +264,8 @@ github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0 github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4= github.com/elastic/elastic-agent-client/v7 v7.16.0 h1:yKGq2+CxAuW8Kh0EoNl202tqAyQKfBcPRawVKs2Jve0= github.com/elastic/elastic-agent-client/v7 v7.16.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI= -<<<<<<< HEAD -github.com/elastic/elastic-agent-libs v0.13.0 h1:I0ZKvjIqT8ka7d2gX6Ta3nXrCZKysZ+N8VIKIuqqir0= -github.com/elastic/elastic-agent-libs v0.13.0/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M= -======= github.com/elastic/elastic-agent-libs v0.15.0 h1:MGl6vFu5YAxFHA+wDhXbQl2OvSk/MRgezxBCD5kCwIg= github.com/elastic/elastic-agent-libs v0.15.0/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M= ->>>>>>> bd29f19143 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#5873)) github.com/elastic/elastic-agent-system-metrics v0.11.3 h1:LDzRwP8kxvsYEtMDgMSKZs1TgPcSEukit+/EAP5Y28A= github.com/elastic/elastic-agent-system-metrics v0.11.3/go.mod h1:saqLKe9fuyuAo6IADAnnuy1kaBI7VNlxfwMo8KzSRyQ= github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA=