https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41803
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #2 from David Nind <[email protected]> --- The patch no longer applies 8-(... git bz apply 41803 Bug 41803 - Improvements to consistency in basket groups template 192840 - Bug 41803: Improvements to consistency in basket groups template Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 41803: Improvements to consistency in basket groups template Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 41803: Improvements to consistency in basket groups template -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
