http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12988
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #11 from Paola Rossi <[email protected]> --- I've tried to apply the patches against master 3.17.00.025 I've applied: 12844 (4), 12986, 12987 (2), 12955 Applying: Bug 12988: Update table footer with the visible rows - budgets 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/admin/aqbudgets.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt Failed to merge in the changes. Patch failed at 0001 Bug 12988: Update table footer with the visible rows - budgets So I pass the patch to "Patch doesn't apply" status. -- 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/
