File tree Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -127,7 +127,11 @@ include::{hadoop-repo-dir}/appendix/breaking.adoc[tag=notable-v8-breaking-change
127
127
This list summarizes the most important breaking changes in {elastic-sec} {version}. For
128
128
the complete list, go to {security-guide-all}/8.0/release-notes-header-8.0.0.html#breaking-changes-8.0.0[{elastic-sec} breaking changes].
129
129
130
+ <<<<<<< HEAD
130
131
include::{security-repo-dir}/release-notes/8.0.asciidoc[tag=breaking-changes]
132
+ =======
133
+ include::{security-repo-dir}/release-notes/8.8.asciidoc[tag=breaking-changes]
134
+ >>>>>>> 413a91f5 (docs: temp comment out include (#2626))
131
135
132
136
[[kibana-breaking-changes]]
133
137
=== {kib} breaking changes
Original file line number Diff line number Diff line change 1
1
[[elastic-stack]]
2
2
= Elastic Installation and Upgrade Guide
3
3
4
- :apm-repo-dir: {apm-server-root}/docs
4
+ :apm-repo-dir: {apm-server-root}/changelogs
5
5
:beats-repo-dir: {beats-root}/libbeat/docs
6
6
:es-repo-dir: {elasticsearch-root}/docs/reference
7
7
:hadoop-repo-dir: {elasticsearch-hadoop-root}/docs/src/reference/asciidoc
You can’t perform that action at this time.
0 commit comments