All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 5ac14e79 authored by Kevin Atkinson's avatar Kevin Atkinson

Bug fix.

parent 32577aae
......@@ -2578,7 +2578,7 @@ if test -e "$srcdir/.merge-build"; then
echo "#/bin/sh" > sync
echo >> sync
echo "cd \"$srcdir\"" >> sync
echo "\"$srcdir/utils/merge-build\" sync" >> sync
echo "utils/merge-build sync" >> sync
chmod +x sync
echo "Merge-build enabled"
fi
......
......@@ -823,7 +823,7 @@ if test -e "$srcdir/.merge-build"; then
echo "#/bin/sh" > sync
echo >> sync
echo "cd \"$srcdir\"" >> sync
echo "\"$srcdir/utils/merge-build\" sync" >> sync
echo "utils/merge-build sync" >> sync
chmod +x sync
echo "Merge-build enabled"
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment