[Koha-bugs] [Bug 23295] Automatically debar patrons if SMS or email notice fail

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

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

Matthias Le Gac <matthias.le-gac at inlibro.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |matthias.le-gac at inlibro.com

--- Comment #13 from Matthias Le Gac <matthias.le-gac at inlibro.com> ---
When I applied the patch it doesnt't work. I have this error :

Applying: Bug 23295: Automatically restrict (debar) patrons when email/sms
notices fail
Using index info to reconstruct a base tree...
M       Koha/Notice/Message.pm
M       installer/data/mysql/mandatory/sysprefs.sql
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
Auto-merging installer/data/mysql/mandatory/sysprefs.sql
Auto-merging Koha/Notice/Message.pm
CONFLICT (content): Merge conflict in Koha/Notice/Message.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 23295: Automatically restrict (debar) patrons when
email/sms notices fail

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