Fix wrong merge (#27976)

elastic · Sep 16, 2021 · d1081d5 · d1081d5
1 parent cbbe8c2
commit d1081d5
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/libbeat/docs/release.asciidoc b/libbeat/docs/release.asciidoc
@@ -8,11 +8,9 @@ This section summarizes the changes in each release. Also read
 <<breaking-changes>> for more detail about changes that affect
 upgrade.
 
-<<<<<<< HEAD
+* <<release-notes-8.0.0-alpha2>>
 * <<release-notes-8.0.0-alpha1>>
-=======
 * <<release-notes-7.14.2>>
->>>>>>> 8afdddc333 (Forward port 7.14.2 changelog to 7.x (#27972))
 * <<release-notes-7.14.1>>
 * <<release-notes-7.14.0>>
 * <<release-notes-7.13.4>>