patch applied (ghc-new-tc/haddock2): Solve conflicts

Simon Peyton Jones <[email protected]> Fri, 16 Jul 2010 08:04:52 -0700

Newsgroups	gmane.comp.lang.haskell.cvs.other
Message-ID	<[email protected]>

Mon Mar 15 15:29:37 PDT 2010  [email protected]
  * Solve conflicts

    M ./haddock.cabal -1 +1

View patch online:
http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=ghc-new-tc/haddock2;a=darcs_commitdiff;h=20100315222937-02453-a836d394725fc5868f39c8607410b891876347d5.gz