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