[commit: ghc] overlapping-tyfams: Fixing merge conflicts. (f3879c7)

[Richard Eisenberg]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : overlapping-tyfams

https://github.com/ghc/ghc/commit/f3879c775e3ef64e82fb7be541843f1a8032c18d

>---------------------------------------------------------------

commit f3879c775e3ef64e82fb7be541843f1a8032c18d
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Jun 21 08:42:54 2013 +0100

    Fixing merge conflicts.

>---------------------------------------------------------------

 compiler/deSugar/DsMeta.hs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/compiler/deSugar/DsMeta.hs b/compiler/deSugar/DsMeta.hs
index 57b35b3..99ae2fa 100644
--- a/compiler/deSugar/DsMeta.hs
+++ b/compiler/deSugar/DsMeta.hs
@@ -376,21 +376,9 @@ repClsInstD (ClsInstDecl { cid_poly_ty = ty, cid_binds = binds
 repTyFamInstD :: TyFamInstDecl Name -> DsM (Core TH.DecQ)
 repTyFamInstD decl@(TyFamInstDecl { tfid_eqn = eqn })
   = do { let tc_name = tyFamInstDeclLName decl
-<<<<<<< HEAD
        ; tc <- lookupLOcc tc_name		-- See note [Binders and occurrences]  
        ; eqn1 <- repTyFamEqn eqn
        ; repTySynInst tc eqn1 }
-||||||| merged common ancestors
-       ; tc <- lookupLOcc tc_name		-- See note [Binders and occurrences]  
-       ; eqns1 <- mapM repTyFamEqn eqns
-       ; eqns2 <- coreList tySynEqnQTyConName eqns1
-       ; repTySynInst tc eqns2 }
-=======
-       ; tc <- lookupLOcc tc_name               -- See note [Binders and occurrences]
-       ; eqns1 <- mapM repTyFamEqn eqns
-       ; eqns2 <- coreList tySynEqnQTyConName eqns1
-       ; repTySynInst tc eqns2 }
->>>>>>> master
 
 repTyFamEqn :: LTyFamInstEqn Name -> DsM (Core TH.TySynEqnQ)
 repTyFamEqn (L loc (TyFamInstEqn { tfie_pats = HsWB { hswb_cts = tys