https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32028
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #4 from David Nind <[email protected]> --- The patch no longer applies 8-(.. git bz apply 32028 Bug 32028 - Add page-section to various administration pages (part 2) 143052 - Bug 32028: Add page-section to smart-rules.tt and fix markup errors 143146 - Bug 32028: Add page-section to various admin pages Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 32028: Add page-section to smart-rules.tt and fix markup errors Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 32028: Add page-section to smart-rules.tt and fix markup errors -- 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/
