From: Martin Mares Date: Mon, 17 Jun 2013 14:52:34 +0000 (+0200) Subject: "make clean" does not care about CVS mismerges any longer X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=8a9b97c3b91fa3b90f059842e1032122e262ca42;p=netgrind.git "make clean" does not care about CVS mismerges any longer --- diff --git a/Makefile b/Makefile index 8080154..30c4656 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ PROGS= all: dirtree programs dust:: - rm -f `find . -path "*~" -or -name "\#*\#" -or -name core` + rm -f `find . -path "*~" -or -name core` clean:: dust rm -rf obj