https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26933
David Nind <da...@davidnind.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
--- Comment #10 from David Nind <da...@davidnind.com> ---
The patch no longer applies 8-(...
git bz apply 26933
Bug 26933 - Improve handling of multiple covers on catalog search results in
the OPAC
164669 - Bug 26933: Improve handling of multiple covers on catalog search
results in the OPAC
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 26933: Improve handling of multiple covers on catalog search
results 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-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
Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
error: Failed to merge in the changes.
Patch failed at 0001 Bug 26933: Improve handling of multiple covers on catalog
search results in the OPAC
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
