Commit c1a7d1a6 authored by simonmar's avatar simonmar
Browse files

[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.
parent 6b200733
......@@ -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)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment