diff options
author | Andreas Gohr <andi@splitbrain.org> | 2011-02-06 20:28:39 +0100 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2011-02-06 20:28:39 +0100 |
commit | 14739a206f851219daa577abdfd7489d86b0072b (patch) | |
tree | 3a0809915af7ac5949a8db792e4bf6a6fca60d11 /inc/parser/xhtml.php | |
parent | d0b3f06b8b1835b2c332d9b5ac06fe68d890bf5e (diff) | |
download | rpg-14739a206f851219daa577abdfd7489d86b0072b.tar.gz rpg-14739a206f851219daa577abdfd7489d86b0072b.tar.bz2 |
Revert "merged branch 'danny0838:rewrite_block' and resolved conflict"
Anika's merge did not pul in the individual patches as one would expect.
Then I messed up when trying to fix this by merging with danny's repo
again but used the wrong branch. So we're still missing two patches. To
have them apply cleanly I have to revert Anika's merge here. Another
merge for the missing two patches will follow.
This reverts commit b17e20ac9cca30b612968d02f06fa9c5df5c01f0.
Diffstat (limited to 'inc/parser/xhtml.php')
-rw-r--r-- | inc/parser/xhtml.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index b502b4f6b..9405d9420 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -29,7 +29,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { var $doc = ''; // will contain the whole document var $toc = array(); // will contain the Table of Contents - var $sectionedits = array(); // A stack of section edit data + private $sectionedits = array(); // A stack of section edit data var $headers = array(); var $footnotes = array(); |