# HG changeset patch
# User jwe
# Date 848266444 0
# Node ID aad9cc70dfb2b1f2c3026eba2ae0b56cde4aef69
# Parent  8561d88be5f2b6c39d780be8868eaf0e04a31ce2
[project @ 1996-11-17 21:34:03 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 Sun Nov 17 14:14:48 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* Makefile.in (parse.cc): Expect 12 shift/reduce conflicts.
+
 	* parse.y (set_stmt_print_flag): New function.
 	(sep_type): New member for bison %union declaration.
 	Simplify rules for statement lists keeping track of the type of
diff --git a/src/Makefile.in b/src/Makefile.in
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -358,7 +358,7 @@
 # Special rules -- these files need special things to be defined.
 
 parse.cc : parse.y
-	@echo "expect 18 shift/reduce conflicts"
+	@echo "expect 12 shift/reduce conflicts"
 	$(YACC) $(YFLAGS) $<
 	@$(top_srcdir)/move-if-change y.tab.c $(@F)