[commit: ghc] wip/T8584: Update baseline shift/reduce conflict number (42d491a)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/T8584
Link       : http://ghc.haskell.org/trac/ghc/changeset/42d491af1f6e33a5cc0adecef59fcce41c7bb2fa/ghc

>---------------------------------------------------------------

commit 42d491af1f6e33a5cc0adecef59fcce41c7bb2fa
Author: Dr. ERDI Gergo <gergo at erdi.hu>
Date:   Wed Jul 2 19:18:43 2014 +0800

    Update baseline shift/reduce conflict number


>---------------------------------------------------------------

42d491af1f6e33a5cc0adecef59fcce41c7bb2fa
 compiler/parser/Parser.y | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index 2e1b777..1123375 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -86,6 +86,12 @@ import TysWiredIn       ( unitTyCon, unitDataCon, tupleTyCon, tupleCon, nilDataC
 
 {-
 -----------------------------------------------------------------------------
+25 June 2014
+
+Conflicts: 47 shift/reduce
+           1 reduce/reduce
+
+-----------------------------------------------------------------------------
 12 October 2012
 
 Conflicts: 43 shift/reduce