diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 16:31:13 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 16:31:13 +0200 |
| commit | eaf929ccf7ff1f4d0175dc607754d07c1b918485 (patch) | |
| tree | f95a46315aa1f2d012c0caa3f410e661228fe124 /ikiwiki_da.setup | |
| parent | 23ad0936a856dfb67523924e8f036f3289acd218 (diff) | |
| parent | 180ccc7daa9e3df65ae946f0eed6c1dc818c5f07 (diff) | |
Merge branch 'allinone-da' into allinone-multilang
Conflicts (manually resolved):
ikiwiki_da.setup
Diffstat (limited to 'ikiwiki_da.setup')
| -rw-r--r-- | ikiwiki_da.setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index c428f65..ad9df6f 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -36,7 +36,7 @@ use IkiWiki::Setup::Standard { templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit_l10n/da', # base wiki source location underlaydirs => [ - $ENV{'HOME'} . "/private_webdata/samplewiki/content_l10n/da", + $ENV{'HOME'} . '/private_webdata/samplewiki/content', #$ENV{'HOME'} . '/private_webdata/samplewiki/smiley_l10n/da', $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit_l10n/da', ], |