https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23228
Maryse Simard <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #2 from Maryse Simard <[email protected]> --- Patch doesn't apply Applying: Bug 23228: Add option to automatically display payment receipt for printing after making a payment Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref M members/paycollect.pl Falling back to patching base and 3-way merge... Auto-merging members/paycollect.pl CONFLICT (content): Merge conflict in members/paycollect.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref error: Failed to merge in the changes. Patch failed at 0001 Bug 23228: Add option to automatically display payment receipt for printing after making a payment -- 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/
