https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36182
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #27 from Katrin Fischer <[email protected]> --- The patch no longer applies, I'll keep the rel_24_11_candidate as this is "mostly display" bug. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36182: Add booksellerid column to holdings table Using index info to reconstruct a base tree... M admin/columns_settings.yml M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt Auto-merging admin/columns_settings.yml CONFLICT (content): Merge conflict in admin/columns_settings.yml error: Failed to merge in the changes. Patch failed at 0001 Bug 36182: Add booksellerid column to holdings table hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/2311-Bug-36182-Add-booksellerid-column-to-holdings-ujf64c3n.patch -- 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/
