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

[git at git.haskell.org]

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

On branch  : wip/T8584
Link       : http://ghc.haskell.org/trac/ghc/changeset/296eba6607fb1d24573330953786a177f0ade9b2/ghc

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

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

    Update baseline shift/reduce conflict number


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

296eba6607fb1d24573330953786a177f0ade9b2
 compiler/parser/Parser.y.pp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index e33808d..e0eaf4d 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -72,6 +72,12 @@ import Control.Monad    ( mplus )
 
 {-
 -----------------------------------------------------------------------------
+25 June 2014
+
+Conflicts: 47 shift/reduce
+           1 reduce/reduce
+
+-----------------------------------------------------------------------------
 12 October 2012
 
 Conflicts: 43 shift/reduce