From 0c9271dfc6de335e3968d1d6fbc8bc0bc49fe751 Mon Sep 17 00:00:00 2001
From: Benjamin Ironside Goldstein
 <91905639+benironside@users.noreply.github.com>
Date: Wed, 10 Jul 2024 15:51:40 -0700
Subject: [PATCH] Update docs/release-notes/8.14.asciidoc

---
 docs/release-notes/8.14.asciidoc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/release-notes/8.14.asciidoc b/docs/release-notes/8.14.asciidoc
index 69199d29f4..5e51058ae8 100644
--- a/docs/release-notes/8.14.asciidoc
+++ b/docs/release-notes/8.14.asciidoc
@@ -2,8 +2,6 @@
 == 8.14
 
 [discrete]
-<<<<<<< HEAD
-=======
 [[release-notes-8.14.3]]
 === 8.14.3