From da2710464297b80e04b22d9f605715d4c7ab31d6 Mon Sep 17 00:00:00 2001
From: Craig MacKenzie <craig.mackenzie@elastic.co>
Date: Thu, 13 Jun 2024 13:10:43 -0400
Subject: [PATCH] Fix merge conflict in libbeat/docs/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 fa7176ac21f..8e5cc8488a7 100644
--- a/libbeat/docs/version.asciidoc
+++ b/libbeat/docs/version.asciidoc
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 :stack-version: 8.14.1
 :doc-branch: 8.14
-:go-version: 1.21.10
-=======
-:stack-version: 8.15.0
-:doc-branch: main
 :go-version: 1.21.11
->>>>>>> b5155a177e ([Automation] Bump Golang version to 1.21.11 (#39851))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12