Fixing 8.12 docs (#37411)

elastic · Dec 12, 2023 · 3b5d4e1 · 3b5d4e1
1 parent 4a9311e
commit 3b5d4e1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -3,8 +3,6 @@
 :issue: https://github.com/elastic/beats/issues/
 :pull: https://github.com/elastic/beats/pull/
 
-<<<<<<< HEAD
-=======
 [[release-notes-8.11.3]]
 === Beats version 8.11.3
 https://github.com/elastic/beats/compare/v8.11.2\...v8.11.3[View commits]
@@ -66,7 +64,6 @@ https://github.com/elastic/beats/compare/v8.11.1\...v8.11.2[View commits]
 - Upgrade to Go 1.20.11. {pull}37123[37123]
 
 
->>>>>>> 06a8c09655 (docs: Prepare Changelog for 8.11.3 (#37399) (#37402))
 [[release-notes-8.11.1]]
 === Beats version 8.11.1
 https://github.com/elastic/beats/compare/v8.11.0\...v8.11.1[View commits]

diff --git a/libbeat/docs/release.asciidoc b/libbeat/docs/release.asciidoc
@@ -8,11 +8,8 @@ This section summarizes the changes in each release. Also read
 <<breaking-changes>> for more detail about changes that affect
 upgrade.
 
-<<<<<<< HEAD
-=======
 * <<release-notes-8.11.3>>
 * <<release-notes-8.11.2>>
->>>>>>> 06a8c09655 (docs: Prepare Changelog for 8.11.3 (#37399) (#37402))
 * <<release-notes-8.11.1>>
 * <<release-notes-8.11.0>>
 * <<release-notes-8.10.4>>