https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39947 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #2 from David Nind <david@davidnind.com> --- The patch no longer applies 8-(... git bz apply 39947 Bug 39947 - Do not use bg-* Bootstrap classes 182687 - Bug 39947: Do not use bg-* Bootstrap classes Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 39947: Do not use bg-* Bootstrap classes 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 39947: Do not use bg-* Bootstrap classes -- You are receiving this mail because: You are watching all bug changes.