[fix conflicts with FrontEnd.TI patches
John Meacham <john@repetae.net>**20060226114521] hunk ./FrontEnd/TI/Module.hs 26
+import FrontEnd.TiData
hunk ./FrontEnd/TI/Module.hs 51
--- Extra data produced by the front end, used to fill in the Ho file.
-data TiData = TiData {
-    tiDataLiftedInstances :: Map.Map Name HsDecl,
-    tiDataModules :: [(Module,HsModule)],
-    tiModuleOptions :: [(Module,Opt)],
-    tiAllAssumptions :: Map.Map Name Scheme
-}
-
hunk ./FrontEnd/Tc/Module.hs 44
-import TIModule(TiData(..))
hunk ./FrontEnd/Tc/Module.hs 49
--- Extra data produced by the front end, used to fill in the Ho file.
-data TiData = TiData {
-    tiDataLiftedInstances :: Map.Map Name HsDecl,
-    tiDataModules :: [(Module,HsModule)],
-    tiModuleOptions :: [(Module,Opt)],
-    tiCheckedRules :: [Rule],
-    tiAllAssumptions :: Map.Map Name Scheme
-}
hunk ./FrontEnd/TiData.hs 3
-import HsSyn
hunk ./FrontEnd/TiData.hs 4
-import Representation
+
+import FrontEnd.Tc.Type
+import HsSyn
hunk ./FrontEnd/TiData.hs 9
+import Representation
hunk ./FrontEnd/TiData.hs 16
+    tiCheckedRules :: [Rule],