From 4bb965d9ec4d3d759e1bb4374f8391cf694e14bb Mon Sep 17 00:00:00 2001
From: "M. Scot Breitenfeld" <brtnfld@hdfgroup.org>
Date: Fri, 11 Jan 2019 10:59:48 -0600
Subject: misc. merge clean-up

---
 release_docs/RELEASE.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 06c7c6a..3d93b80 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -408,8 +408,6 @@ Bug Fixes since HDF5-1.10.3 release
 
       (MSB, 2018/12/04, HDFFV-10511)
 
-<<<<<<< HEAD
-=======
     - Fixed issue with Fortran not returning h5o_info_t field values 
       meta_size%attr%index_size and  meta_size%attr%heap_size.
 
@@ -685,7 +683,6 @@ Bug Fixes since HDF5-1.10.2 release
     Testing
     -------
 
->>>>>>> fb5d83e146... Updated Fortran Bug and new features
 Supported Platforms
 ===================
 
-- 
cgit v0.12