From 92f4153a86a6a77f8d10507f3f922677da19a4b9 Mon Sep 17 00:00:00 2001
From: lrknox <lrknox>
Date: Fri, 17 Feb 2017 15:32:07 -0600
Subject: Resolve missed conflicts.

---
 bin/snapshot | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/bin/snapshot b/bin/snapshot
index 68cad59..cc4bbc9 100755
--- a/bin/snapshot
+++ b/bin/snapshot
@@ -124,11 +124,7 @@ CHECKINSTALL()
 # Safety measure to avoid unintended checkins to other repositories.
 COMMITSNAPSHOT()
 {
-<<<<<<< HEAD
     echo "original hdf5 script committed code changes back into git."
-=======
-    echo "original hdf5 script checked code back into svn."
->>>>>>> f37f35245d10afc251aa2398b7cfe186ea927c78
 }
 
 DISPLAYUSAGE()
@@ -516,11 +512,7 @@ done
 #=============================
 if [ "$cmd" = "all" -o -n "$cmdcheckout" ]; then
     TIMESTAMP "checkout"
-<<<<<<< HEAD
     # ${BASEDIR}/bin is now updated from git by EveningMaint or DailyMaint
-=======
-    # ${BASEDIR}/bin is now updated from svn by EveningMaint or DailyMaint
->>>>>>> f37f35245d10afc251aa2398b7cfe186ea927c78
     # to avoid updating the scripts in ${BASEDIR}/bin while they are running.
 
     if [ -z "$AUTOGEN" ]; then
-- 
cgit v0.12