[freeside-commits] freeside Makefile,1.196.2.8,1.196.2.9

[Ivan,,,]

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

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

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.196.2.8
retrieving revision 1.196.2.9
diff -u -w -d -r1.196.2.8 -r1.196.2.9
--- Makefile	15 Jun 2011 01:37:52 -0000	1.196.2.8
+++ Makefile	15 Jun 2011 01:41:14 -0000	1.196.2.9
@@ -394,7 +394,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...