http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14846
Liz Rea <l...@catalyst.net.nz> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |l...@catalyst.net.nz
--- Comment #3 from Liz Rea <l...@catalyst.net.nz> ---
I get this when applying on 3.20.05:
Bug 14846 - Items with no holdingbranch causes user's holds display to freeze
42691 - Bug 14846 - Items with no holdingbranch causes svc/holds to crash
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 14846 - Items with no holdingbranch causes svc/holds to crash
Using index info to reconstruct a base tree...
M svc/holds
Falling back to patching base and 3-way merge...
Auto-merging svc/holds
CONFLICT (content): Merge conflict in svc/holds
Failed to merge in the changes.
Patch failed at 0001 Bug 14846 - Items with no holdingbranch causes svc/holds
to crash
--
You are receiving this mail because:
You are the assignee for the bug.
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
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/
