diff options
author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-08-14 20:27:34 +0100 |
---|---|---|
committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-08-14 20:27:34 +0100 |
commit | 5c93cc347773c7634321edd5f808d5b55b46301f (patch) | |
tree | 68ea86252d22e06c744d779770a3557000abbad6 /html-test/run.lhs | |
parent | 5b81a9e53894d2ae591ca0c6c96199632d39eb06 (diff) | |
parent | 6b00a11733a8ae02c11e57a75265abd2dc77ecb0 (diff) |
Merge branch 'reverts'
This reverts any changes that were made to have Haddock compile with
7.9. When 7.10 release comes, we can simply re-apply all the patches and
any patches that occur on ghc-head branch from now on.
This allows us to build master with 7.8.3
Diffstat (limited to 'html-test/run.lhs')
-rwxr-xr-x | html-test/run.lhs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/html-test/run.lhs b/html-test/run.lhs index a8664363..153ab32c 100755 --- a/html-test/run.lhs +++ b/html-test/run.lhs @@ -41,7 +41,7 @@ main = do test :: IO () test = do x <- doesFileExist haddockPath - unless x $ System.Exit.die "you need to run 'cabal build' successfully first" + unless x $ die "you need to run 'cabal build' successfully first" contents <- getDirectoryContents testDir args <- getArgs |