https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15261
Lucie Gay <lucie....@ens-paris-saclay.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |lucie.gay@ens-paris-saclay. | |fr --- Comment #52 from Lucie Gay <lucie....@ens-paris-saclay.fr> --- The sandbox you've requested is not ready. Some problems occurred applying patches from bug 15261: <h1>Something went wrong !</h1>Applying: Bug 15261: Verify if checkouts/reserves requests periods overlap... Using index info to reconstruct a base tree... M C4/Circulation.pm M C4/Reserves.pm M Koha/DateUtils.pm M circ/circulation.pl M installer/data/mysql/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref M koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt M opac/opac-reserve.pl M reserve/placerequest.pl Falling back to patching base and 3-way merge... Auto-merging reserve/placerequest.pl Auto-merging opac/opac-reserve.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Auto-merging installer/data/mysql/sysprefs.sql Auto-merging circ/circulation.pl Auto-merging Koha/DateUtils.pm Auto-merging C4/Reserves.pm Auto-merging C4/Circulation.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 15261: Verify if checkouts/reserves requests periods overlap... 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. Bug 15261 - Verify if checkouts or reserves requests periods overlap with existing reserves 68852 - Bug 15261: Verify if checkouts/reserves requests periods overlap... 68853 - Bug 15261 - Check reserves while renewing an issue Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-15261-Verify-if-checkoutsreserves-requests-per-9hD_17.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/