summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-15 09:09:41 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-15 09:09:41 +0200
commit40455f89a08242e5a7417133304953d5a9b1c5bb (patch)
treec25e58e5d1d4e419c501b12f2ecb2595772635de /Makefile
parenteef5d621955a05ee72f63c83732900928f6be90d (diff)
parent29bba6f30c6feda9934abbb57da54c26ffacee0c (diff)
Merge branch 'nonedit' into allinone-da
Conflicts (manually resolved): Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e28abc8..2aa84c3 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ ikiwiki_LOCALES = da
dummy_MODULES = content_dummy
# uncomment this when ikiwiki.setup is configured for the local environment
-#CONFIGS = ikiwiki_da.setup ikiwiki_da_admin.setup
+#CONFIGS = ikiwiki_da_admin.setup ikiwiki_da.setup
# Everything after this is generic