diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-10-02 00:43:19 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-10-02 00:43:19 +0200 |
| commit | 7dce6ac4a1cf590af687a6a3c1bcd216df478205 (patch) | |
| tree | 65937c16121da25d140e4dd14e7a790eee1e96fc /ikiwiki_nb_admin.setup | |
| parent | 59c2906de93b29e7321114b6c5623479fb182da6 (diff) | |
| parent | 309681793c2c86f697308e96e3398389fb1f708c (diff) | |
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (manually resolved):
ikiwiki_nb_admin.setup
Diffstat (limited to 'ikiwiki_nb_admin.setup')
| -rw-r--r-- | ikiwiki_nb_admin.setup | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki_nb_admin.setup b/ikiwiki_nb_admin.setup index 1fb8cd7..591625b 100644 --- a/ikiwiki_nb_admin.setup +++ b/ikiwiki_nb_admin.setup @@ -45,9 +45,9 @@ use IkiWiki::Setup::Standard { disable_plugins => [qw{ }], # location of template files - templatedir => $basedir . 'templates_nb', + templatedir => $basedir . '/templates_nb', # base wiki source location - underlaydir => $basedir . 'basewiki_nb', + underlaydir => $basedir . '/basewiki_nb', # display verbose messages when building? #verbose => 1, # log to syslog? |