https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33544
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #19 from David Nind <[email protected]> --- The patch no longer applies 8-(... git bz apply 33544 Bug 33544 - Squash some ILL fields to alleviate request table overflow 162945 - Bug 33544: Replace title details with one column 162946 - Bug 33544: Update columns_settings.yml 162947 - Bug 33544: Link title in details to biblio Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 33544: Replace title details with one column Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js error: Failed to merge in the changes. Patch failed at 0001 Bug 33544: Replace title details with one column -- 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/
