From 863473a8566df02a7c8ac0cc57005e84a7189419 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 9 Mar 2004 11:24:36 +0000 Subject: remove ares/aclocal.m4 before cvs update to prevent bad conflicts --- testcurl.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testcurl.sh b/testcurl.sh index 1b63c68c9..043f66ca2 100755 --- a/testcurl.sh +++ b/testcurl.sh @@ -180,6 +180,11 @@ cd $CURLDIR # Do the CVS thing, or not... if [ $CVS -eq 1 ]; then + + # this is a temporary fix to make things work again, remove later + log "remove ares/aclocal.m4" + rm -f ares/aclocal.m4 + log "update from CVS" cvsup() { -- cgit v1.2.3