mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve missed conflicts.

Browse Source
This commit is contained in:
lrknox 2017-02-17 15:32:07 -06:00
parent 4b0de5860f
commit 92f4153a86
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/snapshot
View File

@ -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