diff options
| -rwxr-xr-x | Misc/build.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/build.sh b/Misc/build.sh index 0c058e3..bf3c883 100755 --- a/Misc/build.sh +++ b/Misc/build.sh @@ -259,6 +259,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 |