https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19534 José-Mario Monteiro-Santos <jose-mario.monteiro-santos@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jose-mario.monteiro-santos@ | |inlibro.com Status|Needs Signoff |Patch doesn't apply --- Comment #2 from José-Mario Monteiro-Santos <jose-mario.monteiro-santos@inlibro.com> --- Patch doesn't apply Applying: Bug [19534] - [Adding collection code attribute to cover image div] Adds collection code value to cover image class, so specific collection code icons can be assigned to search results Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt error: Failed to merge in the changes. Patch failed at 0001 Bug [19534] - [Adding collection code attribute to cover image div] Adds collection code value to cover image class, so specific collection code icons can be assigned to search results -- You are receiving this mail because: You are watching all bug changes.