https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26397 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |david@davidnind.com --- Comment #4 from David Nind <david@davidnind.com> --- Patch no longer applies 8-( Applying: Bug 26397: opac.scss calls non-existent image Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss A koha-tmpl/opac-tmpl/bootstrap/css/src/right-to-left.scss Falling back to patching base and 3-way merge... CONFLICT (modify/delete): koha-tmpl/opac-tmpl/bootstrap/css/src/right-to-left.scss deleted in HEAD and modified in Bug 26397: opac.scss calls non-existent image. Version Bug 26397: opac.scss calls non-existent image of koha-tmpl/opac-tmpl/bootstrap/css/src/right-to-left.scss left in tree. Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss -- You are receiving this mail because: You are watching all bug changes.