Commit 863473a8 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

remove ares/aclocal.m4 before cvs update to prevent bad conflicts

parent be6af69d
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -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() {