First draft (#2477)

(cherry picked from commit 08e3dc4) # Conflicts: # docs/en/install-upgrade/breaking.asciidoc
elastic · Jul 25, 2023 · a64fc73 · a64fc73
1 parent aaea553
commit a64fc73
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/docs/en/install-upgrade/breaking.asciidoc b/docs/en/install-upgrade/breaking.asciidoc
@@ -67,9 +67,15 @@ include::{es-repo-dir}/migration/migrate_8_9.asciidoc[tag=notable-breaking-chang
 ++++
 
 This list summarizes the most important breaking changes in {elastic-sec} {version}. For
+<<<<<<< HEAD
 the complete list, go to {security-guide-all}/8.8/release-notes-header-8.8.0.html#breaking-changes-8.8.1[{elastic-sec} breaking changes].
 
 //include::{security-repo-dir}/release-notes/8.9.asciidoc[tag=breaking-changes] 
+=======
+the complete list, go to {security-guide-all}/8.9/release-notes-header-8.9.0.html#breaking-changes-8.9.0[{elastic-sec} breaking changes].
+
+include::{security-repo-dir}/release-notes/8.9.asciidoc[tag=breaking-changes] 
+>>>>>>> 08e3dc45 (First draft (#2477))
 
 [[kibana-breaking-changes]]
 === {kib} breaking changes