[commit: ghc] wip/generalized-arrow: Fix rebase (1099a96)

[git at git.haskell.org]

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

On branch  : wip/generalized-arrow
Link       : http://ghc.haskell.org/trac/ghc/changeset/1099a960764ce1e67e6955c2e06be71ba9a6381b/ghc

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

commit 1099a960764ce1e67e6955c2e06be71ba9a6381b
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Mar 11 17:23:30 2016 +0100

    Fix rebase


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

1099a960764ce1e67e6955c2e06be71ba9a6381b
 compiler/prelude/PrelNames.hs            | 38 +++++++++++++--------------
 compiler/typecheck/TcInteract.hs         | 14 +++++-----
 libraries/base/Data/Typeable/Internal.hs | 44 ++++++++++++++++----------------
 3 files changed, 48 insertions(+), 48 deletions(-)

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

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1099a960764ce1e67e6955c2e06be71ba9a6381b