https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35883
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-(... ... Applying: Bug 35883: Use template wrapper for accordions: Table settings administration Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 35883: Use template wrapper for accordions: Table settings administration ... -- 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/
