From b43e5603b3ffa9ebe17c15a4e9a7461a7bed4cca Mon Sep 17 00:00:00 2001 From: David Waern Date: Sun, 14 Nov 2010 23:49:45 +0000 Subject: Solve conflict --- haddock.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haddock.cabal b/haddock.cabal index 3ec8eef7..bb28f649 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -82,7 +82,7 @@ executable haddock array, xhtml >= 3000.2 && < 3000.3, Cabal >= 1.5, - ghc >= 6.12 && < 7.1 + ghc >= 7.0 && < 7.2 if flag(in-ghc-tree) cpp-options: -DIN_GHC_TREE @@ -142,7 +142,7 @@ library array, xhtml >= 3000.2 && < 3000.3, Cabal >= 1.5, - ghc >= 6.12 && < 7.1 + ghc >= 7.0 && < 7.2 if flag(in-ghc-tree) cpp-options: -DIN_GHC_TREE -- cgit v1.2.3