http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5338
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #15 from Paola Rossi <[email protected]> --- I've applied the patch against master 3.19.00.005 Applying: Bug 5338: Serials Report Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/columns.def Auto-merging C4/Reports/Guided.pm CONFLICT (content): Merge conflict in C4/Reports/Guided.pm Failed to merge in the changes. Patch failed at 0001 Bug 5338: Serials Report I pass the patch to "Patch doesn't apply" status. -- You are receiving this mail because: You are the QA Contact for the bug. 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/
