added protection to Makfile against deploying cvs conflicts

diff --git a/Makefile b/Makefile
index 41be03b..30008d5 100644 (file)
--- 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...