http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8236
Pierre Angot <tredok.pie...@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #58 from Pierre Angot <tredok.pie...@gmail.com> --- Hello, Test on sandbox : Something went wrong ! Applying: Bug 8236 Block renewing for overdue items\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging C4/Circulation.pm Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt\nFailed to merge in the changes.\nPatch failed at 0001 Bug 8236 Block renewing for overdue items 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".\nBug 8236 - Prevent renewing if overdue or restriction 21163 - Bug 8236 Block renewing for overdue items -- 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/