https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36207 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |david@davidnind.com --- Comment #5 from David Nind <david@davidnind.com> --- The patch no longer applies (is a dependency for bug 36166): git bz apply 36207 Bug 36207 - Convert browser alerts to modals: OPAC tags 163578 - Bug 36207: Use confirmation modal when removing tags from titles in the OPAC Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36207: Use confirmation modal when removing tags from titles in the OPAC Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss error: Failed to merge in the changes. Patch failed at 0001 Bug 36207: Use confirmation modal when removing tags from titles in the OPAC -- You are receiving this mail because: You are watching all bug changes.