Zander/zanders-php-markdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing a few merge problems.

Browse source
This commit is contained in:
Michel Fortin 2007-08-28 17:38:38 -04:00
parent b08020a293
commit 42b4bfd385
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
markdown.php
View file

@ -340,7 +340,7 @@ class Markdown_Parser {
function hashHTMLBlocks($text) {
if ($this->no_markup) return $text;
$less_than_tab = $this->tab_width - 1;
# Hashify HTML blocks:
@ -383,7 +383,7 @@ class Markdown_Parser {
|
<\2 # nested opening tag
'.$attr.' # attributes
(?:
(?>
/>
|
>', $nested_tags_level). # end of opening tag
@ -1463,8 +1463,6 @@ class Markdown_Parser {
}
}
#
# Markdown Extra Parser Class