https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26537
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #21 from Katrin Fischer <[email protected]> --- The patch doesn't apply, I believe the fix is probably simple but don't want to mess with it: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 26537: use QueryBuilder in unimarc_field_4XX plugin to make query Using index info to reconstruct a base tree... M cataloguing/value_builder/unimarc_field_4XX.pl Falling back to patching base and 3-way merge... Auto-merging cataloguing/value_builder/unimarc_field_4XX.pl CONFLICT (content): Merge conflict in cataloguing/value_builder/unimarc_field_4XX.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 26537: use QueryBuilder in unimarc_field_4XX plugin to make query hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-26537-use-QueryBuilder-in-unimarcfield4XX-plug-sBlXav.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
