[commit: ghc] late-lam-lift: fixed conflict in simpleCore pipeline (fc34e65)

[Nicolas Frisby]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : late-lam-lift

https://github.com/ghc/ghc/commit/fc34e657c4112e7b35a56ccc36e8ffbad9a73747

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

commit fc34e657c4112e7b35a56ccc36e8ffbad9a73747
Author: Nicolas Frisby <nicolas.frisby at gmail.com>
Date:   Wed Mar 20 16:56:45 2013 +0000

    fixed conflict in simpleCore pipeline

 compiler/main/DynFlags.hs        |  19 +--
 compiler/simplCore/CoreMonad.lhs |   3 +-
 compiler/simplCore/SetLevels.lhs | 264 +++++++++++++++++++++------------------
 compiler/simplCore/SimplCore.lhs |   5 +-
 4 files changed, 159 insertions(+), 132 deletions(-)


Diff suppressed because of size. To see it, use:

    git show fc34e657c4112e7b35a56ccc36e8ffbad9a73747