Resolve conflicts.

elastic · Oct 16, 2023 · 53564cd · 53564cd
1 parent 91eb2f7
commit 53564cd
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 28 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-ARG GO_VERSION=1.20.8
-=======
 ARG GO_VERSION=1.20.10
->>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601))
 FROM circleci/golang:${GO_VERSION}
 
 

diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-ARG GO_VERSION=1.20.8
-=======
 ARG GO_VERSION=1.20.10
->>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601))
 ARG crossbuild_image="docker.elastic.co/beats-dev/golang-crossbuild"
 ARG AGENT_VERSION=8.9.0-SNAPSHOT
 ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent"

diff --git a/changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml b/changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml
@@ -11,11 +11,7 @@
 kind: breaking-change
 
 # Change summary; a 80ish characters long description of the change.
-<<<<<<<< HEAD:changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml
 summary: Elastic-agent-autodiscover to v0.6.4. Disables metadata for deployment and cronjob
-========
-summary: Upgrade to Go 1.20.10.
->>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601)):changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml
 
 # Long description; in case the summary is not enough to describe the change
 # this field accommodate a description without length limits.
@@ -29,11 +25,7 @@ component: "elastic-agent"
 # If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
 # NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
 # Please provide it if you are adding a fragment for a different PR.
-<<<<<<<< HEAD:changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml
 pr: https://github.com/elastic/elastic-agent/pull/3591
-========
-pr: https://github.com/elastic/elastic-agent/pull/3601
->>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601)):changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml
 
 # Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
 # If not present is automatically filled by the tooling with the issue linked to the PR number.

diff --git a/changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml b/changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml
@@ -11,11 +11,7 @@
 kind: breaking-change
 
 # Change summary; a 80ish characters long description of the change.
-<<<<<<<< HEAD:changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml
-summary: Elastic-agent-autodiscover to v0.6.4. Disables metadata for deployment and cronjob
-========
 summary: Upgrade to Go 1.20.10.
->>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601)):changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml
 
 # Long description; in case the summary is not enough to describe the change
 # this field accommodate a description without length limits.
@@ -29,11 +25,7 @@ component: "elastic-agent"
 # If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
 # NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
 # Please provide it if you are adding a fragment for a different PR.
-<<<<<<<< HEAD:changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml
-pr: https://github.com/elastic/elastic-agent/pull/3591
-========
 pr: https://github.com/elastic/elastic-agent/pull/3601
->>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601)):changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml
 
 # Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
 # If not present is automatically filled by the tooling with the issue linked to the PR number.

diff --git a/version/docs/version.asciidoc b/version/docs/version.asciidoc
@@ -3,11 +3,7 @@
 // FIXME: once elastic.co docs have been switched over to use `main`, remove
 // the `doc-site-branch` line below as well as any references to it in the code.
 :doc-site-branch: master
-<<<<<<< HEAD
-:go-version: 1.20.8
-=======
 :go-version: 1.20.10
->>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12