[Koha-bugs] [Bug 22818] ILL should be able to send notices

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

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

Andrew Isherwood <andrew.isherwood at ptfs-europe.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Patch doesn't apply         |Passed QA

--- Comment #161 from Andrew Isherwood <andrew.isherwood at ptfs-europe.com> ---
Hi Jonathan

I experienced the conflicts you did, but didn't have any problem with the
second "Respond to feedback" patch:

Applying: Bug 22818: (follow-up) Respond to feedback
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc

Anyway, I've just attached a new set of patches with the conflicts resolved,
try again and see how it goes

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