[Koha-bugs] [Bug 17006] REST API: add route to change patron's password
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Thu Jan 4 01:34:07 CET 2018
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17006
Katrin Fischer <katrin.fischer at bsz-bw.de> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |katrin.fischer at bsz-bw.de
Status|Signed Off |Patch doesn't apply
--- Comment #39 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patch doesn't apply, please also take a look at comment#38.
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 17006: Add API route for changing patron's password
Using index info to reconstruct a base tree...
M Koha/Patron.pm
M Koha/REST/V1/Patron.pm
M api/v1/swagger/paths.json
M api/v1/swagger/paths/patrons.json
M t/db_dependent/api/v1/patrons.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/api/v1/patrons.t
Auto-merging api/v1/swagger/paths/patrons.json
Auto-merging api/v1/swagger/paths.json
CONFLICT (content): Merge conflict in api/v1/swagger/paths.json
Auto-merging Koha/REST/V1/Patron.pm
Auto-merging Koha/Patron.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 17006: Add API route for changing patron's password
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-17006-Add-API-route-for-changing-patrons-passw-7eNHth.patch
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list