http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10374 I'm just a bot <gitbot@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |gitbot@bugs.koha-community. | |org --- Comment #8 from I'm just a bot <gitbot@bugs.koha-community.org> --- Applying: Bug 10374 - Clean up and unify CircControl related code Using index info to reconstruct a base tree... M C4/Circulation.pm M C4/Reserves.pm M reserve/request.pl M t/db_dependent/Circulation.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Circulation.t CONFLICT (content): Merge conflict in t/db_dependent/Circulation.t Auto-merging reserve/request.pl Auto-merging C4/Reserves.pm CONFLICT (content): Merge conflict in C4/Reserves.pm Auto-merging C4/Circulation.pm Patch failed at 0001 Bug 10374 - Clean up and unify CircControl related code 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.