http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037
--- Comment #34 from Pierre Angot <[email protected]> --- Sandbox setup by [email protected] with database 2 and bug 8037 on Thu Jun 6 09:08:01 2013 Something went wrong ! Applying: Bug 8037 - Add holds and funds to items already received in parcel.pl Applying: Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup Applying: Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup 2 Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup 2 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 8037 - Add holds and funds to items already received in parcel.pl Bug 8037 - Add holds and funds to items already received in parcel.pl Apply? [yn] Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup Apply? [yn] Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup 2 Apply? [yn] Patch left in /tmp/Bug-8037---Add-holds-and-funds-to-items-already-re-9gNZuE.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/
