aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2012-08-02 17:25:57 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2012-08-02 17:25:57 -0700
commit2403ca86f937dd591a302b41c5d974f9228b2809 (patch)
treef463730f14bc47dcc2f2b8de3b74f102d94c01cf /src
parent33fd791ea10e6d2a2ef53a1be5c8d2459a37ba6e (diff)
downloadpandoc-2403ca86f937dd591a302b41c5d974f9228b2809.tar.gz
Markdown reader: Import <> from Text.Pandoc.Builder.
This way the module will work with versions of Data.Monoid that don't export <>.
Diffstat (limited to 'src')
-rw-r--r--src/Text/Pandoc/Readers/Markdown.hs4
1 files changed, 2 insertions, 2 deletions
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