From 2a6dccbed095ae897ba405d890c20944a6dcf605 Mon Sep 17 00:00:00 2001
From: "david.waern" <david.waern@gmail.com>
Date: Mon, 15 Mar 2010 22:29:37 +0000
Subject: Solve conflicts

---
 haddock.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'haddock.cabal')

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
-- 
cgit v1.2.3