summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVailin Choi <vchoi@jam.ad.hdfgroup.org>2019-01-06 19:35:31 (GMT)
committerVailin Choi <vchoi@jam.ad.hdfgroup.org>2019-01-06 19:35:31 (GMT)
commit10e504fd4fcfb7eed12877fdc23d14fde7eadc4b (patch)
treeea5d9d9a92ab2361f6130d0a3b2620df7818ab78
parent489f6fb69711ef7f26f4c13ad863438779f654b8 (diff)
downloadhdf5-10e504fd4fcfb7eed12877fdc23d14fde7eadc4b.zip
hdf5-10e504fd4fcfb7eed12877fdc23d14fde7eadc4b.tar.gz
hdf5-10e504fd4fcfb7eed12877fdc23d14fde7eadc4b.tar.bz2
Fix the git merge leftovers in RELEASE.txt.
-rw-r--r--release_docs/RELEASE.txt5
1 files changed, 0 insertions, 5 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 288881d..1b25ec2 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,9 +1,4 @@
-<<<<<<< HEAD
HDF5 version 1.10.5-snap1 currently under development
-=======
- version 1.11.4 currently under development
->>>>>>> c70498f... Merge pull request #1414 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
-================================================================================
INTRODUCTION