summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM. Scot Breitenfeld <brtnfld@hdfgroup.org>2019-01-11 16:59:48 (GMT)
committerM. Scot Breitenfeld <brtnfld@hdfgroup.org>2019-01-11 16:59:48 (GMT)
commit4bb965d9ec4d3d759e1bb4374f8391cf694e14bb (patch)
treefece4bfd027441744a84cbe205476590cb7f9147
parent534e535823f0bbe584f353421bf53f0153882377 (diff)
downloadhdf5-4bb965d9ec4d3d759e1bb4374f8391cf694e14bb.zip
hdf5-4bb965d9ec4d3d759e1bb4374f8391cf694e14bb.tar.gz
hdf5-4bb965d9ec4d3d759e1bb4374f8391cf694e14bb.tar.bz2
misc. merge clean-up
-rw-r--r--release_docs/RELEASE.txt3
1 files changed, 0 insertions, 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
===================