https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28321
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #2 from David Nind <[email protected]> --- 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. _______________________________________________ Koha-bugs mailing list [email protected] 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/
