From c7f44b7b59dd0367c06ff100e0b9e300216d37f7 Mon Sep 17 00:00:00 2001
From: Craig MacKenzie <craig.mackenzie@elastic.co>
Date: Mon, 16 Oct 2023 10:58:41 -0400
Subject: [PATCH] Fix conflict in version.asciidoc

---
 libbeat/docs/version.asciidoc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
index 4ce28cf4ee3..15116afebb1 100644
--- a/libbeat/docs/version.asciidoc
+++ b/libbeat/docs/version.asciidoc
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 :stack-version: 8.10.3
 :doc-branch: 8.10
-:go-version: 1.20.8
-=======
-:stack-version: 8.11.0
-:doc-branch: main
 :go-version: 1.20.10
->>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12