From a23beb608813bb2bc57bf1d0adbb3c1ec47f258a Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
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=utf8
Content-Transfer-Encoding: 8bit

Bad conflict resolution

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>

Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 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 e9d71c0355..7921e01b26 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -391,11 +391,6 @@
                     System preference 'Pseudonymization' is set, but there is not 'bcrypt_settings' entry defined in the $KOHA_CONF file.
                     </td></tr>
                 [% END %]
-                [% IF config_bcrypt_settings_no_set %]
-                    <tr><th scope="row"><strong>Warning</strong> </th><td>
-                    System preference 'Pseudonymization' is set, but there is not 'bcrypt_settings' entry defined in the $KOHA_CONF file.
-                    </td></tr>
-                [% END %]
                 [% IF warnHiddenBiblionumbers.size %]
                     <tr><th scope="row"><strong>Warning</strong> </th><td>
                     [% FOR w IN warnHiddenBiblionumbers %]
-- 
2.39.2