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

added protection to Makfile against deploying cvs conflicts
---

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