diff options
author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-12-23 15:50:28 +0000 |
---|---|---|
committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-12-23 15:50:28 +0000 |
commit | 47be31308f5c90c4ae5e78252989c7da70b46e70 (patch) | |
tree | 46a2c53b699113671eab58bc95f9bd360ad5c828 /src/Main.hs | |
parent | 45e5d834d473ab2f5930371e272a438590bc3f7e (diff) | |
parent | 8bdd26e3d2864151c4d0dccbc530c2deac362892 (diff) |
Merge branch 'master' of http://darcs.haskell.org//haddock
Diffstat (limited to 'src/Main.hs')
-rw-r--r-- | src/Main.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Main.hs b/src/Main.hs index 88c89a19..dc5a49d2 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -54,11 +54,11 @@ import qualified GHC.Paths as GhcPaths import Paths_haddock #endif -import GHC hiding (flags, verbosity) +import GHC hiding (verbosity) import Config -import DynFlags hiding (flags, verbosity) +import DynFlags hiding (verbosity) import StaticFlags (saveStaticFlagGlobals, restoreStaticFlagGlobals) -import Panic (panic, handleGhcException) +import Panic (handleGhcException) import Module import Control.Monad.Fix (MonadFix) |