[Koha-bugs] [Bug 28321] Use template block for display of items in search results

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |david at davidnind.com

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

Applying: Bug 28321: Use template block for display of items in search results
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
Falling back to patching base and 3-way merge...
Removing koha-tmpl/intranet-tmpl/prog/img/item-bullet.gif
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
error: Failed to merge in the changes.
Patch failed at 0001 Bug 28321: Use template block for display of items in
search results

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