https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33260
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #24 from David Nind <[email protected]> --- Patch no longer applies 8-(... Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 33260: Add view_generated_notices user permission Applying: Bug 33260: Add NoticesManagement system preference Applying: Bug 33260: Add a patron getter method to Koha::Notice::Message Using index info to reconstruct a base tree... M t/db_dependent/Letters.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Letters.t CONFLICT (content): Merge conflict in t/db_dependent/Letters.t error: Failed to merge in the changes. Patch failed at 0001 Bug 33260: Add a patron getter method to Koha::Notice::Message -- 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/
