[commit: ghc] wip/perf-testsuite: Weird merging issues. Hopefully I didn't break things horrifically (5f4a7f0)

[git at git.haskell.org]

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

On branch  : wip/perf-testsuite
Link       : http://ghc.haskell.org/trac/ghc/changeset/5f4a7f0fb2ce8f4289145c093d95fd719778cd2a/ghc

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

commit 5f4a7f0fb2ce8f4289145c093d95fd719778cd2a
Merge: 415a990 cd4e438
Author: Jared Weakly <jweakly at pdx.edu>
Date:   Thu Jul 20 17:37:37 2017 -0700

    Weird merging issues. Hopefully I didn't break things horrifically



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

5f4a7f0fb2ce8f4289145c093d95fd719778cd2a
 utils/haddock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)