[Koha-bugs] [Bug 34866] Use template wrapper for breadcrumbs: OPAC part 4

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34866

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |david at davidnind.com

--- Comment #2 from David Nind <david at davidnind.com> ---
Patch no longer applies 8-(..

kohadev-koha at kohadevbox:koha(bz34866)$ git bz apply 34866

Bug 34866 - Use template wrapper for breadcrumbs: OPAC part 4

156004 - Bug 34866: Use template wrapper for breadcrumbs: OPAC part 4

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 34866: Use template wrapper for breadcrumbs: OPAC part 4
Using index info to reconstruct a base tree...
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
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/en/modules/opac-reserve.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 34866: Use template wrapper for breadcrumbs: OPAC part
4

-- 
You are receiving this mail because:
You are watching all bug changes.