summaryrefslogtreecommitdiffstats
path: root/packages/markdown/marked/test/original/strong_and_em_together.md
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-04-20 16:51:57 +0300
committerLauri Ojansivu <x@xet7.org>2019-04-20 16:51:57 +0300
commit02819ca16969b103493ebdd9a66f058995421507 (patch)
treea3352b65083c79ab733db2b99e7c4f0a1276277e /packages/markdown/marked/test/original/strong_and_em_together.md
parent53d42a17ffbc6466d2d422dfdcbd867ea31fe082 (diff)
parenta5122cc0764b57a163c3e8ca3e00e703669a98db (diff)
downloadwekan-02819ca16969b103493ebdd9a66f058995421507.tar.gz
wekan-02819ca16969b103493ebdd9a66f058995421507.tar.bz2
wekan-02819ca16969b103493ebdd9a66f058995421507.zip
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'packages/markdown/marked/test/original/strong_and_em_together.md')
-rw-r--r--packages/markdown/marked/test/original/strong_and_em_together.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/packages/markdown/marked/test/original/strong_and_em_together.md b/packages/markdown/marked/test/original/strong_and_em_together.md
new file mode 100644
index 00000000..95ee690d
--- /dev/null
+++ b/packages/markdown/marked/test/original/strong_and_em_together.md
@@ -0,0 +1,7 @@
+***This is strong and em.***
+
+So is ***this*** word.
+
+___This is strong and em.___
+
+So is ___this___ word.