diff options
| author | David Waern <david.waern@gmail.com> | 2010-11-14 20:26:01 +0000 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2010-11-14 20:26:01 +0000 |
| commit | 18a06f81a5c9772f7f9a1dacf3520c1902fd8e5b (patch) | |
| tree | 905f2ac886e71e82d1378eba488fb80a5f72bdf9 /src | |
| parent | 16cb5a150d0175332a47307c73fec87cb31f481b (diff) | |
Solve conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/Haddock/Backends/Xhtml/Decl.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Haddock/Backends/Xhtml/Decl.hs b/src/Haddock/Backends/Xhtml/Decl.hs index 3fd5a3f6..38302c24 100644 --- a/src/Haddock/Backends/Xhtml/Decl.hs +++ b/src/Haddock/Backends/Xhtml/Decl.hs @@ -727,7 +727,8 @@ ppr_mono_ty _ (HsSpliceTyOut {}) _ _ = error "ppr_mono_ty HsQuasiQuoteT #else ppr_mono_ty _ (HsQuasiQuoteTy {}) _ _ = error "ppr_mono_ty HsQuasiQuoteTy" #endif -ppr_mono_ty _ (HsRecTy {}) _ = error "ppr_mono_ty HsRecTy" +ppr_mono_ty _ (HsCoreTy {}) _ = error "ppr_mono_ty HsCoreTy" +ppr_mono_ty _ (HsRecTy {}) _ _ = error "ppr_mono_ty HsRecTy" ppr_mono_ty ctxt_prec (HsAppTy fun_ty arg_ty) unicode qual = maybeParen ctxt_prec pREC_CON $ |