http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9786
Corinne BULAC <corinnebu...@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |corinnebu...@gmail.com --- Comment #11 from Corinne BULAC <corinnebu...@gmail.com> --- Sandbox setup by corinne.ha...@bulac.fr with database 2 and bug 9786 on Thu Mar 21 09:44:59 2013 Something went wrong ! Applying: Bug 9786 - Holds to pull showing items not available Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging circ/pendingreserves.pl CONFLICT (content): Merge conflict in circ/pendingreserves.pl Failed to merge in the changes. Patch failed at 0001 Bug 9786 - Holds to pull showing items not available 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 9786 - Holds to pull showing items not available Bug 9786 - Holds to pull showing items not available Apply? [yn] Patch left in /tmp/Bug-9786---Holds-to-pull-showing-items-not-availab-HpPDSE.pat -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/