https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23553
Bouzid Fergani <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #2 from Bouzid Fergani <[email protected]> --- Hi, Thanks to rebase this patch for testing. Bug 23553 - Internal server error while placing a reserve through staff interface 92616 - Bug 23553 : fix internal server error while placing reserve on item from pro interface Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 23553 : fix internal server error while placing reserve on item from pro interface Using index info to reconstruct a base tree... M reserve/placerequest.pl Falling back to patching base and 3-way merge... Auto-merging reserve/placerequest.pl CONFLICT (content): Merge conflict in reserve/placerequest.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 23553 : fix internal server error while placing reserve on item from pro interface 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-23553--fix-internal-server-error-while-placing-_8SBm9.patch Bouzid. -- 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/
