From: ivan <ivan>
Date: Wed, 15 Jun 2011 01:41:14 +0000 (+0000)
Subject: added protection to Makfile against deploying cvs conflicts
X-Git-Tag: freeside_2_1_3~136
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=ec2f9c4ac6aaf879abe61444041ca8739621a415;p=freeside.git

added protection to Makfile against deploying cvs conflicts
---

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