https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15647
Eric <eric.gosseli...@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |eric.gosseli...@gmail.com --- Comment #5 from Eric <eric.gosseli...@gmail.com> --- Patch doesn't apply Some problems occurred applying patches from bug 15647: <h1>Something went wrong !</h1>Applying: Bug 15647: Allow selection of destination email address for print overdue notices Using index info to reconstruct a base tree... Koha/Library.pm installer/data/mysql/sysprefs.sql koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref misc/cronjobs/overdue_notices.pl Falling back to patching base and 3-way merge... Auto-merging misc/cronjobs/overdue_notices.pl CONFLICT (content): Merge conflict in misc/cronjobs/overdue_notices.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref Auto-merging installer/data/mysql/sysprefs.sql Auto-merging Koha/Library.pm Patch failed at 0001 Bug 15647: Allow selection of destination email address for print overdue notices -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/