diff options
| author | Tiago Serafim <tserafim@gmail.com> | 2013-02-09 16:51:17 -0200 |
|---|---|---|
| committer | Tiago Serafim <tserafim@gmail.com> | 2013-02-09 17:39:12 -0200 |
| commit | 14f43d5a4c91ac13528f4c9eb8c6247fdafb0ea1 (patch) | |
| tree | edcb6d7462d31d66dcc792ed5e84373187b1de14 /tests/safe_mode/inline-html-simple.html | |
| parent | 6c15c64df40b9ded3f5dea2e694905222791c1b6 (diff) | |
| parent | 41cc055580d63ffb7eb2bbb6c88e121727d91d06 (diff) | |
| download | markdown-14f43d5a4c91ac13528f4c9eb8c6247fdafb0ea1.tar.gz markdown-14f43d5a4c91ac13528f4c9eb8c6247fdafb0ea1.tar.bz2 markdown-14f43d5a4c91ac13528f4c9eb8c6247fdafb0ea1.zip | |
Merge branch 'master' into admonition
Conflicts:
docs/extensions/index.txt
tests/extensions/test.cfg
Diffstat (limited to 'tests/safe_mode/inline-html-simple.html')
| -rw-r--r-- | tests/safe_mode/inline-html-simple.html | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/safe_mode/inline-html-simple.html b/tests/safe_mode/inline-html-simple.html index 981c3a2..1e5df17 100644 --- a/tests/safe_mode/inline-html-simple.html +++ b/tests/safe_mode/inline-html-simple.html @@ -29,8 +29,7 @@ Blah <pre><code><!-- Comment --> </code></pre> <p>Just plain comment, with trailing spaces on the line:</p> -<p><!-- foo --> <br /> -</p> +<p><!-- foo --> </p> <p>Code:</p> <pre><code><hr /> </code></pre> @@ -38,10 +37,8 @@ Blah <p><hr></p> <p><hr/></p> <p><hr /></p> -<p><hr> <br /> -</p> -<p><hr/><br /> -</p> +<p><hr> </p> +<p><hr/> </p> <p><hr /> </p> <p><hr class="foo" id="bar" /></p> <p><hr class="foo" id="bar"/></p> |