From 28e7fbd08f1e4c6a7f6eacb7f99803db29f9efb8 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 26 Jul 2009 20:03:36 +0200
Subject: merge conflict resolve

Ignore-this: f902ad415663a4a1d9e43e0ccc808bbb

darcs-hash:20090726180336-7ad00-fd881cbf4799dd42f53d324550d625bb91274bbe.gz
---
 inc/parser/xhtml.php | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'inc/parser')

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;
     }
-- 
cgit v1.2.3