cvs commit: fptools/ghc/compiler/main HscTypes.lhs fptools/ghc/compiler/typecheck TcRnMonad.lhs

[Simon Marlow]

simonmar    2005/07/08 05:37:58 PDT

  Modified files:        (Branch: ghc-6-4-branch)
    ghc/compiler/main    HscTypes.lhs 
    ghc/compiler/typecheck TcRnMonad.lhs 
  Log:
  Fix merge errors
  
  Revision  Changes    Path
  1.123.2.4 +1 -1      fptools/ghc/compiler/main/HscTypes.lhs
  1.44.2.3  +4 -3      fptools/ghc/compiler/typecheck/TcRnMonad.lhs