[commit: ghc] wip/ttypeable: Fix rebase (6b173f2)

[git at git.haskell.org]

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

On branch  : wip/ttypeable
Link       : http://ghc.haskell.org/trac/ghc/changeset/6b173f25053de3a61186ab638cd7934523a64a6b/ghc

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

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

    Fix rebase


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

6b173f25053de3a61186ab638cd7934523a64a6b
 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 6b173f25053de3a61186ab638cd7934523a64a6b