From 0a93ff502d346fbbe809a336814a837aa10f120e Mon Sep 17 00:00:00 2001 From: David Waern Date: Sat, 16 Oct 2010 17:34:30 +0000 Subject: Solve conflicts --- src/Haddock/Backends/Xhtml/Layout.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Haddock/Backends/Xhtml/Layout.hs') diff --git a/src/Haddock/Backends/Xhtml/Layout.hs b/src/Haddock/Backends/Xhtml/Layout.hs index 7277a683..9ccdd699 100644 --- a/src/Haddock/Backends/Xhtml/Layout.hs +++ b/src/Haddock/Backends/Xhtml/Layout.hs @@ -119,7 +119,8 @@ subDlist quali decls = Just $ dlist << map subEntry decls +++ clearDiv subEntry (decl, mdoc, subs) = dterm ! [theclass "src"] << decl +++ - docElement ddef << (fmap docToHtml mdoc +++ subs) + docElement ddef << (fmap (docToHtml quali) mdoc +++ subs) + clearDiv = thediv ! [ theclass "clear" ] << noHtml -- cgit v1.2.3