From 11c17d23a6429659026a0e771a606b15a35552d9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 27 Aug 2021 16:59:43 +0200 Subject: [PATCH] Bug 28912: Remove duplicated warnings on the about page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bad conflict resolution Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Joonas Kylmälä --- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index 7a12ed0441..4552c95135 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -396,11 +396,6 @@ System preference 'Pseudonymization' is set, but there is not 'bcrypt_settings' entry defined in the $KOHA_CONF file. [% END %] - [% IF config_bcrypt_settings_no_set %] - Warning - System preference 'Pseudonymization' is set, but there is not 'bcrypt_settings' entry defined in the $KOHA_CONF file. - - [% END %] [% IF warnHiddenBiblionumbers.size %] Warning [% FOR w IN warnHiddenBiblionumbers %] -- 2.20.1