Update CHANGELOG.asciidoc

elastic · Dec 16, 2024 · aab4bac · aab4bac
1 parent ffb18b1
commit aab4bac
Showing 1 changed file with 0 additions and 4 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.17.0]]
 === Beats version 8.17.0
 https://github.com/elastic/beats/compare/v8.16.1\...v8.17.0[View commits]
@@ -90,8 +88,6 @@ https://github.com/elastic/beats/compare/v8.16.1\...v8.17.0[View commits]
 - Add handling for missing `EvtVarType`s in experimental API. {issue}19337[19337] {pull}41418[41418]
 - Implement exclusion range support for event_id. {issue}38623[38623] {pull}41639[41639]
 
-
->>>>>>> 4e2d474d1 (Update CHANGELOG.asciidoc (#42054))
 [[release-notes-8.16.1]]
 === Beats version 8.16.1
 https://github.com/elastic/beats/compare/v8.16.0\...v8.16.1[View commits]