From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 27 Aug 2021 14:59:43 +0000 (+0200)
Subject: Bug 28912: Remove duplicated warnings on the about page
X-Git-Tag: v21.11.00~912
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=95ff094030344e22b43ebf73a6a8184bea18c26f;p=srvgit

Bug 28912: Remove duplicated warnings on the about page

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>
---

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.
                     </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 %]