https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24067
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #8 from David Nind <[email protected]> --- Patch no longer applies 8-(: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 24067: Add new subroutine check_resource_ownership Applying: Bug 24067: Use check_resource_ownership in authorization Applying: Bug 24067: Remove check_object_ownership and old authorization methods Applying: Bug 24067: Use owner_authorization in current public endpoints Using index info to reconstruct a base tree... M Koha/REST/V1/Patrons.pm M Koha/REST/V1/Patrons/Password.pm Falling back to patching base and 3-way merge... Auto-merging Koha/REST/V1/Patrons/Password.pm Auto-merging Koha/REST/V1/Patrons.pm CONFLICT (content): Merge conflict in Koha/REST/V1/Patrons.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 24067: Use owner_authorization in current public endpoints -- 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/
