http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10869
Chris Cormack <ch...@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |ch...@bigballofwax.co.nz --- Comment #29 from Chris Cormack <ch...@bigballofwax.co.nz> --- Bug 10869 - can't delete order line if title deleted 22300 - [PATCH] Bug 10869: Allow the deletion of order line if the record is deleted 22676 - [PATCH 2/2] Bug 10869 Followup : change DelOrder and adds UT Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 10869: Allow the deletion of order line if the record is deleted Applying: Bug 10869 Followup : change DelOrder and adds UT fatal: sha1 information is lacking or useless (C4/Acquisition.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 10869 Followup : change DelOrder and adds UT 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 bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/PATCH-22-Bug-10869-Followup--change-DelOrder-and-a-dbVEZx.patch -- You are receiving this mail because: 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/