diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-10-02 00:42:39 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-10-02 00:42:39 +0200 |
| commit | 59c2906de93b29e7321114b6c5623479fb182da6 (patch) | |
| tree | f13b4862445a41626e2b6cf0ec78a3a5f5016a0e /ikiwiki_da_admin.setup | |
| parent | 88f35a8812d4696d412c901ae9c9ccf8db9477a4 (diff) | |
| parent | 1d11a8658bf8ecdb4728bd57ecdbd34cdbec3a6b (diff) | |
Merge branch 'allinone-da' into allinone-multilang
Conflicts (manually resolving):
ikiwiki_da_admin.setup
Diffstat (limited to 'ikiwiki_da_admin.setup')
| -rw-r--r-- | ikiwiki_da_admin.setup | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki_da_admin.setup b/ikiwiki_da_admin.setup index 8da0511..00ccc1e 100644 --- a/ikiwiki_da_admin.setup +++ b/ikiwiki_da_admin.setup @@ -45,9 +45,9 @@ use IkiWiki::Setup::Standard { disable_plugins => [qw{ }], # location of template files - templatedir => $basedir . 'templates_da', + templatedir => $basedir . '/templates_da', # base wiki source location - underlaydir => $basedir . 'basewiki_da', + underlaydir => $basedir . '/basewiki_da', # display verbose messages when building? #verbose => 1, # log to syslog? |