[Koha-bugs] [Bug 30076] Add ability to check patron messaging preferences from a notice
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Sun Mar 27 14:35:52 CEST 2022
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30076
Katrin Fischer <katrin.fischer at bsz-bw.de> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Signed Off |Patch doesn't apply
Keywords| |Manual,
| |release-notes-needed
--- Comment #5 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
It looks like the recalls code interfered here a bit, possibly an easy fix:
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 30076: Add ability to check patron messaging preferences from a
notice
Using index info to reconstruct a base tree...
M Koha/Patron.pm
Falling back to patching base and 3-way merge...
Auto-merging Koha/Patron.pm
CONFLICT (content): Merge conflict in Koha/Patron.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 30076: Add ability to check patron messaging
preferences from a notice
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-30076-Add-ability-to-check-patron-messaging-pr-Kjd5sQ.patch
My only other concern here would be documentation. Maybe we could at least at a
note about this to the wiki pages for TT notices for now, so we got a starting
point for more/better documentation later.
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list