summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorlrknox <lrknox>2017-02-17 21:32:07 (GMT)
committerlrknox <lrknox>2017-02-17 21:32:07 (GMT)
commit92f4153a86a6a77f8d10507f3f922677da19a4b9 (patch)
tree7b7d784cbc645f8e80d543b74faab21391091444 /bin
parent4b0de5860f42e0f4a0d7a0c293a84789cfb1c8a3 (diff)
downloadhdf5-92f4153a86a6a77f8d10507f3f922677da19a4b9.zip
hdf5-92f4153a86a6a77f8d10507f3f922677da19a4b9.tar.gz
hdf5-92f4153a86a6a77f8d10507f3f922677da19a4b9.tar.bz2
Resolve missed conflicts.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/snapshot8
1 files changed, 0 insertions, 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