Skip to content

Commit 3dbdcdf

Browse files
nastasha-solomonmergify[bot]
authored andcommitted
[DOCS] Add Elastic Security breaking changes to Installation and Upgrade Guide for 8.3 (#2148)
(cherry picked from commit 5ad3225) # Conflicts: # docs/en/install-upgrade/breaking.asciidoc
1 parent 9235e27 commit 3dbdcdf

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

docs/en/install-upgrade/breaking.asciidoc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,17 @@ include::{es-repo-dir}/migration/migrate_8_3.asciidoc[tag=notable-breaking-chang
6565
<titleabbrev>{elastic-sec}</titleabbrev>
6666
++++
6767

68+
<<<<<<< HEAD
6869
This list summarizes the most important breaking changes in {elastic-sec} {version}.
6970
//For the complete list, go to {security-guide-all}/8.3/release-notes-header-8.2.0.html#breaking-changes-8.2.0[{elastic-sec} breaking changes].
7071

7172
//include::{security-repo-dir}/release-notes/8.3.asciidoc[tag=breaking-changes]
73+
=======
74+
This list summarizes the most important breaking changes in {elastic-sec} {version}. For
75+
the complete list, go to {security-guide-all}/8.3/release-notes-header-8.3.0.html#breaking-changes-8.3.0[{elastic-sec} breaking changes].
76+
77+
include::{security-repo-dir}/release-notes/8.3.asciidoc[tag=breaking-changes]
78+
>>>>>>> 5ad3225 ([DOCS] Add Elastic Security breaking changes to Installation and Upgrade Guide for 8.3 (#2148))
7279
7380
[[kibana-breaking-changes]]
7481
=== {kib} breaking changes

0 commit comments

Comments
 (0)