aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Waern <david.waern@gmail.com>2010-07-24 15:34:37 +0000
committerDavid Waern <david.waern@gmail.com>2010-07-24 15:34:37 +0000
commitd17d34e0cb6674eb6743d7deb36958b1b3a97b6d (patch)
treec13a7b0c5717513ab4571f100fa09759f9cf5036
parent02ad09def3e3fe962468523c0ea17446b5a890f1 (diff)
Remove conflict left-over
-rw-r--r--src/Haddock/Backends/LaTeX.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Haddock/Backends/LaTeX.hs b/src/Haddock/Backends/LaTeX.hs
index 04a139e7..9b73415a 100644
--- a/src/Haddock/Backends/LaTeX.hs
+++ b/src/Haddock/Backends/LaTeX.hs
@@ -485,7 +485,7 @@ ppClassDecl instances loc mbDoc subdocs
| null lsigs, null ats = Nothing
| null ats = Just methodTable
--- | otherwise = atTable $$ methodTable
-+ | otherwise = error "LaTeX.ppClassDecl"
+ | otherwise = error "LaTeX.ppClassDecl"
methodTable =
text "\\haddockpremethods{}\\textbf{Methods}" $$