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

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

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

Sat Oct 16 10:34:30 PDT 2010  David Waern <[email protected]>
  * Solve conflicts

    M ./src/Haddock/Backends/Xhtml.hs -13 +15
    M ./src/Haddock/Backends/Xhtml/Layout.hs -1 +2
    M ./src/Haddock/Options.hs +10

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