[commit: haddock] ghc-new-co: Follow changes (8629dd6)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/haddock

On branch  : ghc-new-co

http://hackage.haskell.org/trac/ghc/changeset/8629dd6f9d17746e25d1a1a9851225c907badb70

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

commit 8629dd6f9d17746e25d1a1a9851225c907badb70
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Feb 29 17:54:36 2012 +0000

    Follow changes

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

 src/Haddock/Backends/Xhtml/Decl.hs |    2 +-
 src/Haddock/Convert.hs             |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Haddock/Backends/Xhtml/Decl.hs b/src/Haddock/Backends/Xhtml/Decl.hs
index 5f4e4ef..71bcd58 100644
--- a/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/src/Haddock/Backends/Xhtml/Decl.hs
@@ -121,7 +121,7 @@ ppFor _ _ _ _ _ _ _ = error "ppFor"
 -- we skip type patterns for now
 ppTySyn :: Bool -> LinksInfo -> SrcSpan -> DocForDecl DocName -> TyClDecl DocName -> Bool
         -> Qualification -> Html
-ppTySyn summary links loc doc (TySynonym (L _ name) ltyvars _ ltype_ ) unicode qual
+ppTySyn summary links loc doc (TySynonym (L _ name) ltyvars _ ltype _) unicode qual
   = ppTypeOrFunSig summary links loc [name] (unLoc ltype) doc
                    (full, hdr, spaceHtml +++ equals) unicode qual
   where
diff --git a/src/Haddock/Convert.hs b/src/Haddock/Convert.hs
index 8c3435b..480e572 100644
--- a/src/Haddock/Convert.hs
+++ b/src/Haddock/Convert.hs
@@ -166,11 +166,7 @@ synifyTyCon tc
   alg_deriv = Nothing
   syn_type = synifyType WithinType (synTyConType tc)
  in if isSynTyCon tc
-<<<<<<< HEAD
-  then TySynonym name Nothing tyvars typats syn_type placeHolderNames
-=======
-  then TySynonym name tyvars typats syn_type
->>>>>>> master
+  then TySynonym name tyvars typats syn_type placeHolderNames
   else TyData alg_nd alg_ctx name Nothing tyvars typats (fmap synifyKind alg_kindSig) alg_cons alg_deriv