From c49d15c17468993df8a0c484d02f9952df1f9700 Mon Sep 17 00:00:00 2001
From: Quincey Koziol <quincey@koziol.cc>
Date: Wed, 25 Sep 2024 12:50:31 -0500
Subject: [PATCH] Remove merge trash

Signed-off-by: Quincey Koziol <quincey@koziol.cc>
---
 release_docs/RELEASE.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index e5dcfe82987..392ebd344ec 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -888,7 +888,6 @@ Bug Fixes since HDF5-1.14.0 release
 
       Fixes GitHub #4656 and GitHub #4662
 
->>>>>>> origin/develop
     - Fixed a bug with large external datasets
 
       When performing a large I/O on an external dataset, the library would only