Remove merge trash

Signed-off-by: Quincey Koziol <[email protected]>
qkoziol · Sep 25, 2024 · c49d15c · c49d15c
1 parent aeeec14
commit c49d15c
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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