cvs commit: fptools/ghc/compiler/iface LoadIface.lhs

[Simon Marlow]

simonmar    2005/09/12 01:48:32 PDT

  Modified files:        (Branch: ghc-6-4-branch)
    ghc/compiler/iface   LoadIface.lhs 
  Log:
  remove conflict in previous merge
  
  Revision  Changes    Path
  1.25.2.7  +0 -13     fptools/ghc/compiler/iface/LoadIface.lhs