X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ddef0d3170b1543e6ed580c7ce00849e3ed1550f..96074523461eb0ad5a419fbcedfe4089ab7a7713:/IkiWiki/Setup/Standard.pm

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 ($$$$) { #{{{