https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29268 Magnus Enger <magnus@libriotech.no> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #6 from Magnus Enger <magnus@libriotech.no> --- $ git bz apply 29268 Bug 29268 - Query used in Koha::Biblio->get_marc_host is incorrect 127591 - Bug 29268: Correct cni handling for get_marc_host Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 29268: Correct cni handling for get_marc_host Using index info to reconstruct a base tree... M Koha/Biblio.pm M t/db_dependent/Koha/Biblio.t M t/db_dependent/Koha/Biblio/host_record.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/Biblio/host_record.t Auto-merging t/db_dependent/Koha/Biblio.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/Biblio.t Auto-merging Koha/Biblio.pm CONFLICT (content): Merge conflict in Koha/Biblio.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 29268: Correct cni handling for get_marc_host 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-29268-Correct-cni-handling-for-getmarchost-k4WekE.patch -- You are receiving this mail because: You are watching all bug changes.