From e40181be768dc726e52698c016e540a0b443b0f9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Jun 2011 01:41:06 +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 8db4c1e49..d4b161162 100644
--- a/Makefile
+++ b/Makefile
@@ -409,7 +409,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.11.0