https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21958
Michal Denar <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #4 from Michal Denar <[email protected]> --- 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. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
