https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35267 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #63 from David Nind <david@davidnind.com> --- Hi martin. Apologies for taking so long to re-test. The patches no longer apply 8-(... git bz apply 35267 Bug 35267 - Clarify CSS options for Notices 175723 - Bug 35267: Add and Update Notice CSS system preferences 175724 - Bug 35267: Add preferences to UI 175725 - Bug 35267: Expose style preferences in template editor 175726 - Bug 35267: Apply preferences to preview and mailing 175727 - Bug 35267: Move JS to bottom in printslip 175728 - Bug 35267: Migrate accounts_summary to printslip 175729 - Bug 35267: Update unit tests Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 35267: Add and Update Notice CSS system preferences Applying: Bug 35267: Add preferences to UI Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref error: Failed to merge in the changes. Patch failed at 0001 Bug 35267: Add preferences to UI -- You are receiving this mail because: You are watching all bug changes.