https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32698
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #2 from David Nind <[email protected]> --- The patch no longer applies 8-(.. git bz apply 32698 Bug 32698 Depends on bug 32571 (Signed Off) Follow? [(y)es, (n)o] y Bug 32571 - Use template wrapper to build tabbed components 145529 - Bug 32571: Use template wrapper to build tabbed components 145530 - Bug 32571: (follow-up) Implement abstracted tabs on About page 145533 - Bug 32571: (follow-up) Use more unique variable name to avoid collisions Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 32571: Use template wrapper to build tabbed components Applying: Bug 32571: (follow-up) Implement abstracted tabs on About page Applying: Bug 32571: (follow-up) Use more unique variable name to avoid collisions Bug 32698 - Use template wrapper for serials pages tabs 145576 - Bug 32698: Use template wrapper for serials pages tabs Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 32698: Use template wrapper for serials pages tabs Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 32698: Use template wrapper for serials pages tabs -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ 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/
