[Koha-bugs] [Bug 21958] _check_valid_auth_link checks too many subfields

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Fri May 3 21:14:19 CEST 2019


https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21958

Michal Denar <black23 at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |black23 at gmail.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #4 from Michal Denar <black23 at gmail.com> ---
Hi Ere,

I get error:
Applying: Bug 21958: Fix bibliographic record field comparison with authority
Using index info to reconstruct a base tree...
M       C4/Biblio.pm
M      
installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql
Falling back to patching base and 3-way merge...
Auto-merging
installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql
Auto-merging C4/Biblio.pm
CONFLICT (content): Merge conflict in C4/Biblio.pm
error: Failed to merge in the changes.

Can you rebase this patch on master?

Thank you.

-- 
You are receiving this mail because:
You are watching all bug changes.


More information about the Koha-bugs mailing list