Update CHANGELOG.asciidoc

elastic · Sep 26, 2024 · bf1035c · bf1035c
1 parent 238420a
commit bf1035c
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -5,15 +5,6 @@
 
 [[release-notes-8.15.2]]
 === Beats version 8.15.2
-<<<<<<< HEAD
-https://github.com/elastic/beats/compare/v8.15.0\...v8.15.2[View commits]
-
-==== Breaking changes
-
-*Metricbeat*
-
-- Add GCP organization and project details to ECS cloud fields. {pull}40461[40461]
-=======
 https://github.com/elastic/beats/compare/v8.15.1\...v8.15.2[View commits]
 
 ==== Bugfixes
@@ -54,7 +45,6 @@ https://github.com/elastic/beats/compare/v8.15.1\...v8.15.2[View commits]
 - Added Cisco Meraki module. {pull}40836[40836]
 - Added Palo Alto Networks module. {pull}40686[40686]
 
->>>>>>> 83effecb68 (docs: Prepare Changelog for 8.15.2 (#40982))
 
 [[release-notes-8.15.1]]
 === Beats version 8.15.1