[freeside-commits] freeside Makefile,1.208,1.209

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside
In directory wavetail.420.am:/tmp/cvs-serv32065

Modified Files:
	Makefile 
Log Message:
added protection to Makfile against deploying cvs conflicts

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -w -d -r1.208 -r1.209
--- Makefile	15 Jun 2011 01:37:52 -0000	1.208
+++ Makefile	15 Jun 2011 01:41:06 -0000	1.209
@@ -409,7 +409,7 @@
 	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...