summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/dokuwiki.php6
1 files changed, 0 insertions, 6 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index ea29f19e1..c82a7f6f3 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -80,10 +80,4 @@ $conf['ftp']['user'] = 'user';
$conf['ftp']['pass'] = 'password';
$conf['ftp']['root'] = '/home/user/htdocs';
-//this includes a local config file if exist which make upgrading more easy - just don't touch this
-if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
-@include(DOKU_INC.'conf/local.php');
-
-//a small bugfix for some browsers/proxies just don't touch this either
-$lang = array();
?>