patch applied (ghc-7.0/testsuite): Resolve conflict in 7.0 branch

[Ian Lynagh]

Sun Feb 13 06:28:28 PST 2011  Ian Lynagh <igloo at earth.li>
  * Resolve conflict in 7.0 branch

    M ./tests/ghc-regress/th/all.T -1 +2

View patch online:
http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=ghc-7.0/testsuite;a=darcs_commitdiff;h=20110213142828-3fd76-c1e61add628166eecf8e54822345fdf778456910.gz