https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28658 Laura Escamilla <Laura.escamilla@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |BLOCKED CC| |Laura.escamilla@bywatersolu | |tions.com --- Comment #5 from Laura Escamilla <Laura.escamilla@bywatersolutions.com> --- Hi Michael, The dependency bug, Bug 28657, still does not apply cleanly to master. Auto-merging C4/Auth.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 28657: expand branches.branchip to allow for multiple ip ranges. [33mhint: Use 'git am --show-current-patch=diff' to see the failed patch[m 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-28657-expand-branchesbranchip-to-allow-for-mul-gxoeH0.patch Cannot apply cleanly patches from bug 28657. Everything will be left dirty. I'm going to mark this bug as blocked again. -- You are receiving this mail because: You are watching all bug changes.