https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19191
Simon Pouchol <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #3 from Simon Pouchol <[email protected]> --- Hey, I tried to test this patch, and couldn't apply it (Dependency patch 14826 applied just fine): Applying: Bug 19191 - Add ability to email receipts for account payments and write-offs Using index info to reconstruct a base tree... M C4/Letters.pm M Koha/Account/Offset.pm M t/db_dependent/Letters/TemplateToolkit.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Letters/TemplateToolkit.t Auto-merging Koha/Account/Offset.pm CONFLICT (content): Merge conflict in Koha/Account/Offset.pm Auto-merging C4/Letters.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 19191 - Add ability to email receipts for account payments and write-offs -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
