http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7703 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #23 from Owen Leonard <oleonard@myacpl.org> --- Applying: Bug 7703 - Don't block bulk hold action if some items can't be placed on hold Applying: Bug 7703 - QA Followup Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Items.pm CONFLICT (content): Merge conflict in C4/Items.pm Auto-merging C4/Biblio.pm CONFLICT (content): Merge conflict in C4/Biblio.pm Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.