patch applied (ghc-7.0/haddock2): Solve conflict

Ian Lynagh <[email protected]> Mon, 13 Dec 2010 11:42:33 -0800

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

Sun Nov 14 15:49:45 PST 2010  David Waern <[email protected]>
  * Solve conflict

    M ./haddock.cabal -2 +2

View patch online:
http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=ghc-7.0/haddock2;a=darcs_commitdiff;h=20101114234945-a762e-d76bb61743bfc70e8d48a988f75105471c61b2a5.gz