[Koha-bugs] [Bug 23781] Recalls notices and messaging preferences

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23781

--- Comment #21 from Aleisha Amohia <aleisha at catalyst.net.nz> ---
(In reply to Marcel de Rooy from comment #19)
> 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
> Falling back to patching base and 3-way merge...
> Auto-merging installer/data/mysql/en/mandatory/sample_notices.yml
> Auto-merging Koha/Recalls.pm
> CONFLICT (content): Merge conflict in Koha/Recalls.pm
> Auto-merging Koha/Recall.pm
> CONFLICT (content): Merge conflict in Koha/Recall.pm

Fixed, set back to Signed Off.

-- 
You are receiving this mail because:
You are watching all bug changes.