[commit: ghc] wip/T15050: Merge remote-tracking branch 'origin/wip/T15050' into wip/T15050 (499bde5)

[git at git.haskell.org]

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

On branch  : wip/T15050
Link       : http://ghc.haskell.org/trac/ghc/changeset/499bde5caaf303df98514afa721bac2c264f50f6/ghc

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

commit 499bde5caaf303df98514afa721bac2c264f50f6
Merge: 1aef2b9 b32988f
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Aug 4 12:54:46 2018 -0400

    Merge remote-tracking branch 'origin/wip/T15050' into wip/T15050



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

499bde5caaf303df98514afa721bac2c264f50f6
 testsuite/tests/typecheck/should_compile/tc141.stderr | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)