diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-04 21:39:53 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-04 21:39:53 +0100 |
| commit | 603c1a1e6dfa9f1bc6759843283a8a7995c613f8 (patch) | |
| tree | 61349b0905bf69e2370f150d6e32901bad1aa25f /inc/parser/code.php | |
| parent | b35d34217e073f330111fea5812fa4d88680a4ef (diff) | |
| parent | 4b142187c1238555a14d79ff6e054a678ce828f3 (diff) | |
| download | rpg-603c1a1e6dfa9f1bc6759843283a8a7995c613f8.tar.gz rpg-603c1a1e6dfa9f1bc6759843283a8a7995c613f8.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into FS#2124deniedtext
Conflicts:
inc/lang/bn/lang.php
inc/lang/fr/denied.txt
Diffstat (limited to 'inc/parser/code.php')
| -rw-r--r-- | inc/parser/code.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/inc/parser/code.php b/inc/parser/code.php index 0b8e3ee02..d77ffd1aa 100644 --- a/inc/parser/code.php +++ b/inc/parser/code.php @@ -5,7 +5,6 @@ * @author Andreas Gohr <andi@splitbrain.org> */ if(!defined('DOKU_INC')) die('meh.'); -require_once DOKU_INC . 'inc/parser/renderer.php'; class Doku_Renderer_code extends Doku_Renderer { var $_codeblock=0; |