see if this helps the doc builds

This commit is contained in:
Benjamin Peterson 2009-04-06 22:53:29 +00:00
parent a27e6e3d58
commit ee42545884
1 changed files with 1 additions and 0 deletions

View File

@ -257,6 +257,7 @@ start=`current_time`
# which will definitely fail with a conflict.
#CONFLICTED_FILE=commontex/boilerplate.tex
#conflict_count=`grep -c "<<<" $CONFLICTED_FILE`
make clean
conflict_count=0
if [ $conflict_count != 0 ]; then
echo "Conflict detected in $CONFLICTED_FILE. Doc build skipped." > ../build/$F