[commit: haddock] T6018-injective-type-families, adamse-D1033, ghc-head, master, wip/10268, wip/10313, wip/D538-4, wip/D538-5, wip/D538-6, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T9840, wip/api-annot-tweaks-7.10, wip/api-annots-ghc-7.10-3, wip/orf-reboot: hide projectVersion from DynFlags since it clashes with Haddock.Version.projectVersion (7f23bd5)

[git at git.haskell.org]

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

On branches: T6018-injective-type-families,adamse-D1033,ghc-head,master,wip/10268,wip/10313,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/7f23bd526a6dd6ed0a2ddeeb30724606ea058ef5

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

commit 7f23bd526a6dd6ed0a2ddeeb30724606ea058ef5
Author: Luite Stegeman <stegeman at gmail.com>
Date:   Wed Nov 19 01:59:50 2014 +0100

    hide projectVersion from DynFlags since it clashes with Haddock.Version.projectVersion


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

7f23bd526a6dd6ed0a2ddeeb30724606ea058ef5
 haddock-api/src/Haddock.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/haddock-api/src/Haddock.hs b/haddock-api/src/Haddock.hs
index ef03f8f..7e01090 100644
--- a/haddock-api/src/Haddock.hs
+++ b/haddock-api/src/Haddock.hs
@@ -63,7 +63,7 @@ import Paths_haddock_api (getDataDir)
 
 import GHC hiding (verbosity)
 import Config
-import DynFlags hiding (verbosity)
+import DynFlags hiding (projectVersion, verbosity)
 import StaticFlags (discardStaticFlags)
 import Panic (handleGhcException)
 import Module