https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23781 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #9 from David Nind <david@davidnind.com> --- Patch no longer applies 8-(.. apologies for not getting back on to this one sooner. Applying: Bug 23781: SMS notices and messaging preferences for recalls Using index info to reconstruct a base tree... M Koha/Recall.pm M Koha/Recalls.pm M installer/data/mysql/en/mandatory/sample_notices.yml M installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql M koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql Auto-merging installer/data/mysql/en/mandatory/sample_notices.yml Auto-merging Koha/Recalls.pm Auto-merging Koha/Recall.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 23781: SMS notices and messaging preferences for recalls -- You are receiving this mail because: You are watching all bug changes.