Commit 41e9276f authored by Simon Peyton Jones's avatar Simon Peyton Jones
Browse files

Merge branch 'master' of http://darcs.haskell.org/ghc

Conflicts:
	compiler/typecheck/FamInst.lhs
parents 4737d64e 851e4e76
......@@ -322,8 +322,8 @@ conflictInstErr fam_inst branch conflictingMatch
= addFamInstsErr (ptext (sLit "Conflicting family instance declarations:"))
[(fam_inst, branch),
(confInst, confIndex) ]
| otherwise
= pprPanic "conflictInstErr" (pprCoAxBranchHdr (famInstAxiom fam_inst) branch)
| otherwise -- no conflict on this branch; see Trac #7560
= return ()
addFamInstsErr :: SDoc -> [(FamInst Branched, Int)] -> TcRn ()
addFamInstsErr herald insts
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment