https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36204
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply --- Comment #5 from Katrin Fischer <[email protected]> --- Can you please rebase? 163029 - Bug 36204: Add othernames field to PatronAutoComplete display Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36204: Add othernames field to PatronAutoComplete display Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/js/staff-global.js Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/js/staff-global.js CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/js/staff-global.js error: Failed to merge in the changes. Patch failed at 0001 Bug 36204: Add othernames field to PatronAutoComplete display 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-36204-Add-othernames-field-to-PatronAutoComple-9i58z0qw.patch kohadev-koha@kohadevbox:koha(main|AM 1/1)$ -- 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/
