From c936715436df9d97fe12b20907b0578643128751 Mon Sep 17 00:00:00 2001
From: David Waern <david.waern@gmail.com>
Date: Sun, 11 Nov 2007 02:28:50 +0000
Subject: [PATCH] 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 9d7759b48b..2413863a0e 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"
--
GitLab