From 3d4c32dacefaf83367215c59e35293144a9f2fe7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 27 Jul 2008 15:08:10 -0400
Subject: lose the ugly $rawsetup, use a function

---
 IkiWiki/Setup/Standard.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Setup')

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 ($$$$) { #{{{
-- 
cgit v1.2.3