Created attachment 9876 [details] [review] Correct double declaration of variable $type in Addreturn variable "$type" was declared twice in Addreturn (Circulation.pm module, line 1631)
Applying: Correct double declaration of variable in Addreturn fatal: sha1 information is lacking or useless (C4/Circulation.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Correct double declaration of variable in Addreturn 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".
I checked the code on current master and the problem seems to be resolved there. Marking the patch resolved for this reason. if($issue->{'overdue'}){ my ( $amount, $type, $daycounttotal ) = C4::Overdues::CalcFine( $item, $borrower->{categorycode},$branch, $datedue, $today ); $type ||= q{};