summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-15 09:10:57 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-15 09:10:57 +0200
commite037fc5228747c7e0d5a3609471943d371c9def5 (patch)
tree6509d44cfe545cbfa4d124c06a9b2215def7352a
parentee222c059e5e3c68666bb9a60a491be6eba33943 (diff)
parent40455f89a08242e5a7417133304953d5a9b1c5bb (diff)
Merge branch 'allinone-da' into allinone-multilang
Conflicts (manually resolved): Makefile
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 84d0412..503d357 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ ikiwiki_LOCALES = da nb
dummy_MODULES = content_dummy content_da_dummy content_nb_dummy
# uncomment this when ikiwiki.setup is configured for the local environment
-#CONFIGS = ikiwiki.setup ikiwiki_da.setup ikiwiki_nb.setup ikiwiki_admin.setup ikiwiki_da_admin.setup ikiwiki_nb_admin.setup
+#CONFIGS = ikiwiki_admin.setup ikiwiki_da_admin.setup ikiwiki_nb_admin.setup ikiwiki.setup ikiwiki_da.setup ikiwiki_nb.setup
# Everything after this is generic