diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:48:44 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:48:44 +0200 |
| commit | a98e5044157ec625c81ecd8e8d325e37d08c468b (patch) | |
| tree | ece85c2497db78969658951980e7e82d93ef7383 | |
| parent | 261cc31af5d1d9a568d3f713ce0273bd84aa889c (diff) | |
| parent | 678bc6f97405e150a3a575bd0cfc42fbb618c365 (diff) | |
Merge branch '_nb' into allinone-nb
Conflicts (manually resolved):
ikiwiki_nb.setup
| -rw-r--r-- | ikiwiki_nb.setup | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 0498a60..e844b58 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -63,7 +63,11 @@ use IkiWiki::Setup::Standard { # strftime format string to display date timeformat => '%c', # UTF-8 locale to use +<<<<<<< HEAD:ikiwiki_nb.setup locale => 'no_NB.UTF-8', +======= + locale => 'nb_NO.UTF-8', +>>>>>>> _nb:ikiwiki_nb.setup # put user pages below specified page userdir => '', # how many backlinks to show before hiding excess (0 to show all) |