https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19809
Bouzid Fergani <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |[email protected] --- Comment #8 from Bouzid Fergani <[email protected]> --- Hi Julian, Thanks to rebase this patch. Bug 19809 - Koha::Objects::find calls do not need to be forbidden in list context 91287 - Bug 19809: Re-allow to call Koha::Objects::find in list context Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19809: Re-allow to call Koha::Objects::find in list context Using index info to reconstruct a base tree... M C4/Reserves.pm M Koha/Patron.pm M cataloguing/moveitem.pl M circ/overdue.pl M members/memberentry.pl M members/pay.pl M opac/opac-memberentry.pl Falling back to patching base and 3-way merge... Auto-merging opac/opac-memberentry.pl CONFLICT (content): Merge conflict in opac/opac-memberentry.pl Auto-merging members/pay.pl Auto-merging members/memberentry.pl Auto-merging circ/overdue.pl Auto-merging cataloguing/moveitem.pl Auto-merging Koha/Patron.pm CONFLICT (content): Merge conflict in Koha/Patron.pm Auto-merging C4/Reserves.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 19809: Re-allow to call Koha::Objects::find in list context The copy of the patch that failed is found in: .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/Bug-19809-Re-allow-to-call-KohaObjectsfind-in-list-_0gg5g.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
