diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2009-07-26 20:03:36 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2009-07-26 20:03:36 +0200 |
| commit | 28e7fbd08f1e4c6a7f6eacb7f99803db29f9efb8 (patch) | |
| tree | 7eadc10da8f69b2c3156aba102b03186633e3129 | |
| parent | 3d491f758802dd2376dddd5d001765b940b08743 (diff) | |
| download | rpg-28e7fbd08f1e4c6a7f6eacb7f99803db29f9efb8.tar.gz rpg-28e7fbd08f1e4c6a7f6eacb7f99803db29f9efb8.tar.bz2 | |
merge conflict resolve
Ignore-this: f902ad415663a4a1d9e43e0ccc808bbb
darcs-hash:20090726180336-7ad00-fd881cbf4799dd42f53d324550d625bb91274bbe.gz
| -rw-r--r-- | inc/parser/xhtml.php | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 3137281e7..a47ceb5eb 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -358,14 +358,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $this->html($text, 'pre'); } - function preformatted($text) { - $this->doc .= '<pre class="code">' . trim($this->_xmlEntities($text)) . '</pre>'. DOKU_LF; - } - - function file($text) { - $this->doc .= '<pre class="file">' . trim($this->_xmlEntities($text)). '</pre>'. DOKU_LF; - } - function quote_open() { $this->doc .= '<blockquote><div class="no">'.DOKU_LF; } |