[Koha-bugs] [Bug 5788] Move ReservesMaxPickupDelay system preference to the Circulation Matrix.

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5788

--- Comment #24 from delaye <stephane.delaye at biblibre.com> ---
I can 't apply in a sandbox for test

i have this message

Applying: bug_5788: Moved ReservesMaxPickupDelay syspref to issue rules
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging admin/smart-rules.pl
Auto-merging installer/data/mysql/updatedatabase.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
Failed to merge in the changes.
Patch failed at 0001 bug_5788: Moved ReservesMaxPickupDelay syspref to issue
rules
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, ins

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.