https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29926
--- Comment #7 from Katrin Fischer <[email protected]> --- The patch currently doesn't apply, can you please fix? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 29926: Add pasword expiration route for API Using index info to reconstruct a base tree... A api/v1/swagger/paths.yaml Falling back to patching base and 3-way merge... CONFLICT (modify/delete): api/v1/swagger/paths.yaml deleted in HEAD and modified in Bug 29926: Add pasword expiration route for API. Version Bug 29926: Add pasword expiration route for API of api/v1/swagger/paths.yaml left in tree. error: Failed to merge in the changes. Patch failed at 0001 Bug 29926: Add pasword expiration route for API hint: Use 'git am --show-current-patch=diff' to see the failed 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-29926-Add-pasword-expiration-route-for-API-QJheMn.patch Wondering: This is kind of an "undocumented" extra for the superlibrarians, that is not covered by any of the permissions. How can we document or should this not better be a new permission? -- 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/
