simonmar 2005/07/08 08:45:22 PDT Modified files: (Branch: ghc-6-4-branch) ghc/compiler/main HscMain.lhs Log: Fix merge error Revision Changes Path 1.203.2.5 +1 -1 fptools/ghc/compiler/main/HscMain.lhs