https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26139
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |BLOCKED --- Comment #6 from Katrin Fischer <[email protected]> --- This depends on bug 23166 that hasn't been signed off yet - moving to BLOCKED. Please bring it back into the QA queue once the dependency is resolved. This patch also does no longer apply. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 26139: Centralize code for "Place hold" button (detail) Using index info to reconstruct a base tree... M t/db_dependent/Koha/Items.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/Items.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/Items.t error: Failed to merge in the changes. Patch failed at 0001 Bug 26139: Centralize code for "Place hold" button (detail) The copy of the patch that failed is found in: .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-26139-Centralize-code-for-Place-hold-button-de-zcySqH.patch -- 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/
