diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 09:10:14 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 09:10:14 +0200 |
| commit | accbb4cb78b50f3d26fbbca5beb664ac5d41bceb (patch) | |
| tree | c102a48576009731c818f6e3a02cc885f4071c80 | |
| parent | bbe3b121170f6eeed8b77616452e04191f5b81a6 (diff) | |
| parent | 29bba6f30c6feda9934abbb57da54c26ffacee0c (diff) | |
Merge branch 'nonedit' into allinone-nb
Conflicts (manually resolved):
Makefile
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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_nb.setup ikiwiki_nb_admin.setup +#CONFIGS = ikiwiki_nb_admin.setup ikiwiki_nb.setup # Everything after this is generic |