From abe12c5b0bc201af3d46a1c2389728f00cf2efa3 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 25 Oct 2008 21:32:37 +0200 Subject: Fix merge noise. --- ikiwiki_nb.setup | 4 ---- 1 file changed, 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) -- cgit v1.2.3