diff options
| author | David Waern <david.waern@gmail.com> | 2010-11-14 23:49:45 +0000 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2010-11-14 23:49:45 +0000 |
| commit | b43e5603b3ffa9ebe17c15a4e9a7461a7bed4cca (patch) | |
| tree | f55e7d693507ac976ec8a40c2c969453604f9b69 | |
| parent | 489688829a432f6c06b6967d31cea3f2b5844a5f (diff) | |
Solve conflict
| -rw-r--r-- | haddock.cabal | 4 |
1 files 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 |