diff options
| -rw-r--r-- | ikiwiki_nb.setup | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index e844b58..1ebcc94 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -63,11 +63,7 @@ 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) |