From 2403ca86f937dd591a302b41c5d974f9228b2809 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 2 Aug 2012 17:25:57 -0700 Subject: Markdown reader: Import <> from Text.Pandoc.Builder. This way the module will work with versions of Data.Monoid that don't export <>. --- src/Text/Pandoc/Readers/Markdown.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index d36194565..b51375cce 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -39,7 +39,7 @@ import Data.Char ( isAlphaNum ) import Data.Maybe import Text.Pandoc.Definition import qualified Text.Pandoc.Builder as B -import Text.Pandoc.Builder (Inlines(..), Blocks, trimInlines) +import Text.Pandoc.Builder (Inlines(..), Blocks, trimInlines, (<>)) import Text.Pandoc.Options import Text.Pandoc.Shared hiding (compactify) import Text.Pandoc.Parsing hiding (tableWith) @@ -47,7 +47,7 @@ import Text.Pandoc.Readers.LaTeX ( rawLaTeXInline, rawLaTeXBlock ) import Text.Pandoc.Readers.HTML ( htmlTag, htmlInBalanced, isInlineTag, isBlockTag, isTextTag, isCommentTag ) import Text.Pandoc.XML ( fromEntities ) -import Data.Monoid +import Data.Monoid hiding ((<>)) import qualified Data.Sequence as Seq -- TODO leaky abstraction, need better isNull in Builder import Control.Applicative ((<$>), (<*), (*>), (<$)) import Control.Monad -- cgit v1.2.3