aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Readers
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2013-01-22 10:26:49 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2013-01-22 10:26:49 -0800
commit94ed282adf39a019a4c68dffd182e2743c651688 (patch)
treef2bdb4d82b0cd7c7b9a6f039dcf39464c83b9254 /src/Text/Pandoc/Readers
parentb4232fdbda386478f394c10e16a7cb5216871828 (diff)
parentd52a1ec18f3344db5d2c835c0e2744a47042170e (diff)
downloadpandoc-94ed282adf39a019a4c68dffd182e2743c651688.tar.gz
Merge branch 'master' of github.com:jgm/pandoc
Diffstat (limited to 'src/Text/Pandoc/Readers')
-rw-r--r--src/Text/Pandoc/Readers/Markdown.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 2c6c47307..4eb17c16b 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -358,12 +358,12 @@ block = choice [ codeBlockFenced
, codeBlockBackticks
, guardEnabled Ext_latex_macros *> (mempty <$ macro)
, header
+ , lhsCodeBlock
, rawTeXBlock
, htmlBlock
, lineBlock
, table
, codeBlockIndented
- , lhsCodeBlock
, blockQuote
, hrule
, bulletList