https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=40960
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #3 from David Nind <[email protected]> --- The patch no longer applies 8-(... git bz apply 40960 Bug 40960 - Notifying holds should not print notice if no messaging preference is notified 187669 - Bug 40960: Fix unit tests 187670 - Bug 40960: Print notification only if selected type is impossible Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 40960: Fix unit tests Using index info to reconstruct a base tree... M t/db_dependent/Reserves.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Reserves.t CONFLICT (content): Merge conflict in t/db_dependent/Reserves.t error: Failed to merge in the changes. Patch failed at 0001 Bug 40960: Fix unit tests -- 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/
