From 43e5d242f5b7960f3b63d6b1cc65552be90fcb7e Mon Sep 17 00:00:00 2001 From: David Waern Date: Sun, 11 Nov 2007 02:28:50 +0000 Subject: Fix conflicts --- src/Haddock/Backends/Html.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Haddock/Backends/Html.hs b/src/Haddock/Backends/Html.hs index 9d7759b4..2413863a 100644 --- a/src/Haddock/Backends/Html.hs +++ b/src/Haddock/Backends/Html.hs @@ -562,7 +562,9 @@ ifaceToHtml maybe_source_url maybe_wiki_url iface no_doc_at_all = not (any has_doc exports) - contents = td << vanillaTable << ppModuleContents exports + contents = case ppModuleContents exports of + Nothing -> [] + Just x -> [td << vanillaTable << x] description = case ifaceRnDoc iface of @@ -593,7 +595,7 @@ ifaceToHtml maybe_source_url maybe_wiki_url iface linksInfo = (maybe_source_url, maybe_wiki_url, iface) -ppModuleContents :: [ExportItem] -> HtmlTable +ppModuleContents :: [ExportItem DocName] -> Maybe HtmlTable ppModuleContents exports | length sections == 0 = Nothing | otherwise = Just (tda [theclass "section4"] << bold << toHtml "Contents" -- cgit v1.2.3