http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9394
[email protected] changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #25 from [email protected] --- Sandbox setup by unknown with database 2 and bug 9394 on Thu May 23 09:50:10 2013 Something went wrong ! Applying: Bug 9394 - Use reserve_id where possible Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Reserves.pm Auto-merging circ/circulation.pl Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt Auto-merging reserve/request.pl CONFLICT (content): Merge conflict in reserve/request.pl Auto-merging serials/routing-preview.pl Failed to merge in the changes. Patch failed at 0001 Bug 9394 - Use reserve_id where possible When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Bug 9394 - Use reserve_id where possible Rebased and signed off patch Apply? [yn] Patch left in /tmp/Rebased-and-signed-off-patch-FnVHt7.patch -- 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/
