https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21781
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #16 from David Nind <[email protected]> --- (In reply to Liz Rea from comment #15) > has anyone tested the latest patches here? setting this to needs signoff so > we can make sure the patches still don't apply. The patch no longer applies 8-(... git bz apply 21781 Bug 21781 - message_transport_type should allow fallbacks 124869 - Bug 21781 - message_transport_type should allow fallbacks Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21781 - message_transport_type should allow fallbacks Using index info to reconstruct a base tree... M C4/Acquisition.pm M C4/Suggestions.pm M Koha/Patron.pm M circ/pendingreserves.pl M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref M misc/cronjobs/membership_expiry.pl M opac/opac-shareshelf.pl Falling back to patching base and 3-way merge... Auto-merging opac/opac-shareshelf.pl Auto-merging misc/cronjobs/membership_expiry.pl CONFLICT (content): Merge conflict in misc/cronjobs/membership_expiry.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref Auto-merging circ/pendingreserves.pl Auto-merging Koha/Patron.pm Auto-merging C4/Suggestions.pm Auto-merging C4/Acquisition.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 21781 - message_transport_type should allow fallbacks -- 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/
