diff --git a/libbeat/docs/release.asciidoc b/libbeat/docs/release.asciidoc index f37aa317b67..d35e3978696 100644 --- a/libbeat/docs/release.asciidoc +++ b/libbeat/docs/release.asciidoc @@ -8,6 +8,10 @@ This section summarizes the changes in each release. Also read <> for more detail about changes that affect upgrade. +<<<<<<< HEAD +======= +* <> +>>>>>>> 61a93f045 ([9.0](backport #43029) [main](backport #42980) docs: Prepare Changelog for 8.17.3 (#43041)) * <> * <> * <>