simonmar 2005/08/10 00:59:09 PDT Modified files: (Branch: ghc-6-4-branch) ghc/compiler/rename RnExpr.lhs Log: fix merge error Revision Changes Path 1.133.2.5 +1 -1 fptools/ghc/compiler/rename/RnExpr.lhs