From 550e83cf8badbf1fbd1f4dc22a38c881d363f57b Mon Sep 17 00:00:00 2001
From: "mcafee%netscape.com" <mcafee%netscape.com>
Date: Thu, 18 Feb 1999 04:33:23 +0000
Subject: [PATCH] Backing the egrep part of slamm's change out, solaris egrep
 doesn't know what -q is

---
 client.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client.mk b/client.mk
index 808a7c6f615..f59f9824342 100644
--- a/client.mk
+++ b/client.mk
@@ -204,10 +204,10 @@ checkout:
 	@date > $(CVSCO_LOGFILE)
 	cd $(ROOTDIR) && \
 	  $(CVSCO) SeaMonkeyEditor | tee -a $(CVSCO_LOGFILE)
-	@if egrep -q "^C " $(CVSCO_LOGFILE) ; then \
-	  echo "$(MAKE): *** Conflicts during checkout. \
-	       Refer to $(CVSCO_LOGFILE)."; \
-	  exit 1; \
+#	@if egrep -q "^C " $(CVSCO_LOGFILE) ; then \
+#	  echo "$(MAKE): *** Conflicts during checkout. \
+#	       Refer to $(CVSCO_LOGFILE)."; \
+#	  exit 1; \
 	fi