https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7614 Alex Buckley <alexbuckley@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |alexbuckley@catalyst.net.nz Status|Needs Signoff |Patch doesn't apply --- Comment #26 from Alex Buckley <alexbuckley@catalyst.net.nz> --- Sorry the patches do not apply, can you please rebase: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 7614: Add a new method Koha::Libraries->pickup_locations Using index info to reconstruct a base tree... M t/db_dependent/Koha/Libraries.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/Libraries.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/Libraries.t Failed to merge in the changes. Patch failed at 0001 Bug 7614: Add a new method Koha::Libraries->pickup_locations The copy of the patch that failed is found in: /home/vagrant/kohaclone/.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". Patch left in /tmp/Bug-7614-Add-a-new-method-KohaLibraries-pickuploca-2UIRVc.patch You have new mail in /var/mail/vagrant -- You are receiving this mail because: You are watching all bug changes.