Fix rebasing errors.
commitc4c56b8c0471b5051d334e8ccc3f2e6cb1efbf13
authorJesse Rosenthal <jrosenthal@jhu.edu>
dateFri 2 Dec 2016, 07:27 (10 years ago)
parentd5051ae
src/Text/Pandoc/Writers/FB2.hs+1−1
@@ -85,7 +85,7 @@ pandocToFB2 :: PandocMonad m
8585 -> Pandoc
8686 -> FBM m String
8787pandocToFB2 opts (Pandoc meta blocks) = do
88− modify (\s -> s { writerOptions = opts { writerOptions = opts } })
88+ modify (\s -> s { writerOptions = opts })
8989 desc <- description meta
9090 fp <- frontpage meta
9191 secs <- renderSections 1 blocks
src/Text/Pandoc/Writers/HTML.hs+1−1
@@ -115,7 +115,7 @@ writeHtml :: PandocMonad m => WriterOptions -> Pandoc -> m Html
115115writeHtml opts d = do
116116 (body, context) <- evalStateT (pandocToHtml opts d) defaultWriterState
117117 return $ case writerTemplate opts of
118− Nothing -> renderHtml body
118+ Nothing -> body
119119 Just tpl -> renderTemplate' tpl $
120120 defField "body" (renderHtml body) context
121121