https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26572 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #3 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Patch no longer applies cleanly, please rebase! Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 26572: Add autocomplete to librarian field in log viewer Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt M koha-tmpl/intranet-tmpl/prog/js/viewlog.js Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/js/viewlog.js CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/js/viewlog.js Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 26572: Add autocomplete to librarian field in log viewer The copy of the patch that failed is found in: .git/rebase-apply/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". -- You are receiving this mail because: You are watching all bug changes.