"make clean" does not care about CVS mismerges any longer

diff --git a/Makefile b/Makefile
index 808015454d0dabeb5b46ddb74e1f42ab53e7b621..30c4656933c6df5ce38e79fe7233ce6d035b1b22 100644 (file)
--- 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