https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36789
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #20 from David Nind <[email protected]> --- The patches no longer apply 8-(... git bz apply 36789 Bug 36789 Depends on bug 36915 (Needs Signoff) Follow? [(y)es, (n)o] y Bug 36915 - Send email notification when a booking is cancelled 168149 - Bug 36915: Send email notification when a booking is cancelled 168150 - Bug 36915: (follow-up) Pass object to GetPreparedLetter 168155 - Bug 36915: (follow-up) Basic sample notice Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36915: Send email notification when a booking is cancelled Applying: Bug 36915: (follow-up) Pass object to GetPreparedLetter Applying: Bug 36915: (follow-up) Basic sample notice Bug 36789 - Transform a booking into checkout 167906 - Bug 36789: Transform a booking into checkout 167907 - Bug 36789: (follow-up) Fix CSRF Token missing Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36789: Transform a booking into checkout Using index info to reconstruct a base tree... M C4/Circulation.pm M Koha/Booking.pm M koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Auto-merging Koha/Booking.pm CONFLICT (content): Merge conflict in Koha/Booking.pm Auto-merging C4/Circulation.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 36789: Transform a booking into checkout -- 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/
