diff options
| author | Waylan Limberg <waylan@gmail.com> | 2012-01-18 21:29:19 -0500 |
|---|---|---|
| committer | Waylan Limberg <waylan@gmail.com> | 2012-01-18 21:29:19 -0500 |
| commit | c33dbafc2663e2d495c53ab0bf26f5f6c4087863 (patch) | |
| tree | a00f8f59e2774438cf66125b362016a19ad1393e /tests/safe_mode/inline-html-simple.html | |
| parent | 77c587e1d16934608fc91aa34894836ef0d03a8b (diff) | |
| parent | 69b365d07c7fabb206d9094398de2162cbcf6ba3 (diff) | |
| download | markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.tar.gz markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.tar.bz2 markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.zip | |
Merge branch 'master' of git://github.com/fiesta/Python-Markdown into fiesta
Conflicts:
markdown/inlinepatterns.py
Diffstat (limited to 'tests/safe_mode/inline-html-simple.html')
| -rw-r--r-- | tests/safe_mode/inline-html-simple.html | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/safe_mode/inline-html-simple.html b/tests/safe_mode/inline-html-simple.html index ad19a77..aca9af0 100644 --- a/tests/safe_mode/inline-html-simple.html +++ b/tests/safe_mode/inline-html-simple.html @@ -29,7 +29,8 @@ Blah <pre><code><!-- Comment --> </code></pre> <p>Just plain comment, with trailing spaces on the line:</p> -<p><!-- foo --></p> +<p><!-- foo --> <br /> +</p> <p>Code:</p> <pre><code><hr /> </code></pre> @@ -37,9 +38,11 @@ Blah <p><hr></p> <p><hr/></p> <p><hr /></p> -<p><hr></p> -<p><hr/></p> -<p><hr /></p> +<p><hr> <br /> +</p> +<p><hr/><br /> +</p> +<p><hr /> </p> <p><hr class="foo" id="bar" /></p> <p><hr class="foo" id="bar"/></p> <p><hr class="foo" id="bar" ></p>
\ No newline at end of file |