From 10e504fd4fcfb7eed12877fdc23d14fde7eadc4b Mon Sep 17 00:00:00 2001
From: Vailin Choi <vchoi@jam.ad.hdfgroup.org>
Date: Sun, 6 Jan 2019 13:35:31 -0600
Subject: Fix the git merge leftovers in RELEASE.txt.

---
 release_docs/RELEASE.txt | 5 -----
 1 file changed, 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
-- 
cgit v0.12