http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8236
--- Comment #35 from Koha Team AMU <[email protected]> --- So sad. It seems we can't test it on a sandbox : Something went wrong ! Applying: Bug 8236 Block renewing for overdue items Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Circulation.pm Auto-merging circ/circulation.pl Auto-merging installer/data/mysql/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt Auto-merging opac/opac-renew.pl CONFLICT (content): Merge conflict in opac/opac-renew.pl Auto-merging opac/opac-user.pl Auto-merging reserve/renewscript.pl Failed to merge in the changes. Patch failed at 0001 Bug 8236 Block renewing for overdue items -- 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/
