patch applied (haddock2): Solve conflict

Ian Lynagh <[email protected]> Fri, 30 Jul 2010 13:59:41 -0700

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

Thu Jul 22 12:31:28 PDT 2010  David Waern <[email protected]>
  * Solve conflict

    M ./src/Haddock/Utils.hs -1 +2

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