[Koha-bugs] [Bug 24401] REST API: Check-in

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24401

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #10 from David Nind <david at davidnind.com> ---
The patch no longer applies 8-(...

Applying: Bug 24401: REST API: Check-in
Using index info to reconstruct a base tree...
M       Koha/REST/V1/Checkouts.pm
M       api/v1/swagger/paths/checkouts.yaml
M       api/v1/swagger/swagger.yaml
M       t/db_dependent/api/v1/checkouts.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/api/v1/checkouts.t
CONFLICT (content): Merge conflict in t/db_dependent/api/v1/checkouts.t
Auto-merging api/v1/swagger/swagger.yaml
Auto-merging api/v1/swagger/paths/checkouts.yaml
Auto-merging Koha/REST/V1/Checkouts.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 24401: REST API: Check-in

-- 
You are receiving this mail because:
You are watching all bug changes.