http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8868
I'm just a bot <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected]. | |org --- Comment #10 from I'm just a bot <[email protected]> --- Applying: Bug 8868: ILS-DI: CancelHold needs to take a reserve_id Using index info to reconstruct a base tree... M C4/ILSDI/Services.pm M C4/Reserves.pm Falling back to patching base and 3-way merge... Auto-merging C4/Reserves.pm Auto-merging C4/ILSDI/Services.pm CONFLICT (content): Merge conflict in C4/ILSDI/Services.pm Patch failed at 0001 Bug 8868: ILS-DI: CancelHold needs to take a reserve_id The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
