summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-15 09:09:05 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-15 09:09:05 +0200
commit2af3220fda3e5b82595a11c7173ac8ea7f68e255 (patch)
treed2652381395e6f3a34ec79f442983def4e65a9aa /Makefile
parent02cdb0723897087e4cdde02bc646085470aedaa2 (diff)
parent29bba6f30c6feda9934abbb57da54c26ffacee0c (diff)
Merge branch 'nonedit' into allinone
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 29baeda..cee6918 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ ikiwiki_templates_FLAVORS = nonedit
dummy_MODULES = content_dummy
# uncomment this when ikiwiki.setup is configured for the local environment
-#CONFIGS = ikiwiki.setup ikiwiki_admin.setup
+#CONFIGS = ikiwiki_admin.setup ikiwiki.setup
# Everything after this is generic