aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Setup
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-27 15:08:10 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-27 15:08:10 -0400
commit3d4c32dacefaf83367215c59e35293144a9f2fe7 (patch)
tree5d11095a187484bc09593ab39078b88c56b01d41 /IkiWiki/Setup
parentddef0d3170b1543e6ed580c7ce00849e3ed1550f (diff)
downloadikiwiki-3d4c32dacefaf83367215c59e35293144a9f2fe7.tar
ikiwiki-3d4c32dacefaf83367215c59e35293144a9f2fe7.tar.gz
lose the ugly $rawsetup, use a function
Diffstat (limited to 'IkiWiki/Setup')
-rw-r--r--IkiWiki/Setup/Standard.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 99da7ed86..9d8ec3851 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -10,7 +10,7 @@ use strict;
use IkiWiki;
sub import { #{{{
- $IkiWiki::Setup::raw_setup=$_[1];
+ IkiWiki::Setup::merge($_[1]);
} #}}}
sub dumpline ($$$$) { #{{{