From ec2f9c4ac6aaf879abe61444041ca8739621a415 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Jun 2011 01:41:14 +0000
Subject: [PATCH] added protection to Makfile against deploying cvs conflicts

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

diff --git a/Makefile b/Makefile
index 41be03b43..30008d598 100644
--- a/Makefile
+++ b/Makefile
@@ -394,7 +394,7 @@ clean:
 	make clean
 
 check-conflicts:
-	! grep -r --exclude=config.log --exclude=config.status --exclude=gnupg_details_on_output_formats '^=======$$' .
+	! grep -r --exclude=config.log --exclude=config.status --exclude=gnupg_details_on_output_formats --exclude=mason_handler. '^=======$$' .
 
 #these are probably only useful if you're me...
 
-- 
2.20.1