From 8a9b97c3b91fa3b90f059842e1032122e262ca42 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Mon, 17 Jun 2013 16:52:34 +0200
Subject: [PATCH] "make clean" does not care about CVS mismerges any longer

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.39.2