aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavid.waern <david.waern@gmail.com>2010-03-15 22:29:37 +0000
committerdavid.waern <david.waern@gmail.com>2010-03-15 22:29:37 +0000
commit2a6dccbed095ae897ba405d890c20944a6dcf605 (patch)
treebed85c419abd6b3cf3450b6c06a2f88f5d757bb5
parentc6ed3d0ac30e32dab29cb4b73b7c03f94dc56404 (diff)
Solve conflicts
-rw-r--r--haddock.cabal2
1 files changed, 1 insertions, 1 deletions
diff --git a/haddock.cabal b/haddock.cabal
index d09c0fa1..572f0d0b 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -1,5 +1,5 @@
name: haddock
-version: 2.6.0
+version: 2.7.0
cabal-version: >= 1.6
license: BSD3
build-type: Simple