From: Benjamin Peterson Date: Mon, 6 Apr 2009 22:53:29 +0000 (+0000) Subject: see if this helps the doc builds X-Git-Tag: v2.7a1~1538 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee42545884552f2f782a2c2f091de8f07169b831;p=python see if this helps the doc builds --- diff --git a/Misc/build.sh b/Misc/build.sh index 2a44ce1975..3774487b21 100755 --- a/Misc/build.sh +++ b/Misc/build.sh @@ -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