From c1a7d1a618d86260360e8bde9429e357df95c2de Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Wed, 24 Nov 2004 13:03:26 +0000
Subject: [PATCH] [project @ 2004-11-24 13:03:26 by simonmar] Update s/r
 conflict total after Ross added four more.  The total
 according to the comment is currently one more than the
 real number, so one of them must have gone away.  At some
 point we should track down which one.

---
 ghc/compiler/parser/Parser.y.pp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghc/compiler/parser/Parser.y.pp b/ghc/compiler/parser/Parser.y.pp
index 0d8b974..4187789 100644
--- a/ghc/compiler/parser/Parser.y.pp
+++ b/ghc/compiler/parser/Parser.y.pp
@@ -46,7 +46,7 @@ import GLAEXTS
 
 {-
 -----------------------------------------------------------------------------
-Conflicts: 29 shift/reduce, [SDM 19/9/2002]
+Conflicts: 33 shift/reduce, [SDM 19/9/2002]
 
 10 for abiguity in 'if x then y else z + 1'		[State 136]
 	(shift parses as 'if x then y else (z + 1)', as per longest-parse rule)
-- 
1.7.10.4