[Koha-bugs] [Bug 18795] REST API: DELETE (anonymize) checkout history

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

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

Bouzid Fergani <bouzid.fergani at inlibro.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |bouzid.fergani at inlibro.com

--- Comment #10 from Bouzid Fergani <bouzid.fergani at inlibro.com> ---
Hi,
Please rebase this patch.

Bug 18795 - REST API: DELETE (anonymize) checkout history

94547 - Bug 18795: DELETE (anonymize) checkout history
94552 - Bug 18795: (follow-up) Check whether patrons exists  before deleting
history
94555 - Bug 18795: (follow-up) Unify error message to be same  across codebase

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 18795: DELETE (anonymize) checkout history
Using index info to reconstruct a base tree...
M       Koha/REST/V1/Checkouts.pm
M       api/v1/swagger/paths.json
Falling back to patching base and 3-way merge...
Auto-merging api/v1/swagger/paths.json
CONFLICT (content): Merge conflict in api/v1/swagger/paths.json
Auto-merging Koha/REST/V1/Checkouts.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 18795: DELETE (anonymize) checkout history
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-18795-DELETE-anonymize-checkout-history-G3iEhh.patch

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