https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33431 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply --- Comment #16 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I am sorry, this no longer applies. I'll put it on my list to check and push with higher priority: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 33431: Make C4::Circulation use C4::Context->yaml_preference Using index info to reconstruct a base tree... M C4/Circulation.pm Falling back to patching base and 3-way merge... Auto-merging C4/Circulation.pm CONFLICT (content): Merge conflict in C4/Circulation.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 33431: Make C4::Circulation use C4::Context->yaml_preference 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-33431-Make-C4Circulation-use-C4Context-yamlpre-issx6rg8.patch -- You are receiving this mail because: You are watching all bug changes.