https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21559
Cori Lynn Arnold <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Failed QA --- Comment #5 from Cori Lynn Arnold <[email protected]> --- Failed to apply :( Bug 21559 - Rules for automatic framework codes 80587 - Bug 21559: Rules for automatic framework codes Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21559: Rules for automatic frameworkcodes Using index info to reconstruct a base tree... M C4/Biblio.pm M cataloguing/addbiblio.pl Falling back to patching base and 3-way merge... Auto-merging cataloguing/addbiblio.pl Auto-merging C4/Biblio.pm CONFLICT (content): Merge conflict in C4/Biblio.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 21559: Rules for automatic frameworkcodes The copy of the patch that failed is found in: .git/rebase-apply/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-21559-Rules-for-automatic-framework-codes-L_HoL6.patch -- 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/
