https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39419
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #9 from David Nind <[email protected]> --- The patch no longer applies 8-(... git bz apply 39419 Bug 39419 - Holds API treats 'expiration_date' as 'patron_expiration_date' 185568 - Bug 39419: Enable Holds API to set expiration_date and patron_expiration_date independently 186240 - Bug 39419: (follow-up) Unit tests Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 39419: Enable Holds API to set expiration_date and patron_expiration_date independently Using index info to reconstruct a base tree... M C4/Reserves.pm M Koha/Hold.pm M Koha/REST/V1/Holds.pm M api/v1/swagger/definitions/hold.yaml M api/v1/swagger/paths/holds.yaml Falling back to patching base and 3-way merge... Auto-merging api/v1/swagger/paths/holds.yaml Auto-merging api/v1/swagger/definitions/hold.yaml Auto-merging Koha/REST/V1/Holds.pm CONFLICT (content): Merge conflict in Koha/REST/V1/Holds.pm Auto-merging Koha/Hold.pm Auto-merging C4/Reserves.pm error: Failed to merge in the changes. Patch failed at 0001 Bug -- 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/
