From: Guido Kanschat Date: Wed, 27 Apr 2005 13:20:00 +0000 (+0000) Subject: conflict resolved X-Git-Tag: v8.0.0~13972 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c6b4ee27e23949cbf52951fdc89e29d5651b008;p=dealii.git conflict resolved git-svn-id: https://svn.dealii.org/trunk@10583 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/Makefile.in b/deal.II/contrib/Makefile.in index 3d266e0f85..684c2a52e3 100644 --- a/deal.II/contrib/Makefile.in +++ b/deal.II/contrib/Makefile.in @@ -40,6 +40,6 @@ endif # generic targets clean: hsl-clean - rm ../lib/contrib/*/*.o + @-rm ../lib/contrib/*/*.o .PHONY: default hsl clean umfpack functionparser