https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16117 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #19 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Sorry, but this needs some work to apply again: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 16117: Log borrower cardnumbers and item barcodes which are not valid Using index info to reconstruct a base tree... M C4/Circulation.pm M circ/circulation.pl M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref M opac/sco/sco-main.pl A t/db_dependent/Stats.t Falling back to patching base and 3-way merge... CONFLICT (modify/delete): t/db_dependent/Stats.t deleted in HEAD and modified in Bug 16117: Log borrower cardnumbers and item barcodes which are not valid. Version Bug 16117: Log borrower cardnumbers and item barcodes which are not valid of t/db_dependent/Stats.t left in tree. Auto-merging opac/sco/sco-main.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Auto-merging installer/data/mysql/mandatory/sysprefs.sql Auto-merging circ/circulation.pl Auto-merging C4/Circulation.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 16117: Log borrower cardnumbers and item barcodes which are not valid 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/Bug-16117-Log-borrower-cardnumbers-and-item-barcod-0_3t9irp.patch -- You are receiving this mail because: You are watching all bug changes.