[Hs-Generics] patch applied (generics): Resolved conflict in NOW

Mon Jun 18 00:37:10 PDT 2007 agerdes@mac.com * Resolved conflict in NOW M! ./comparison/NOW/NOW.hs +13 M! ./comparison/NOW/Paradise.lhs -1 +2