[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 #26 from delaye <stephane.delaye at biblibre.com> ---
Falling back to patching base and 3-way merge...
Auto-merging admin/smart-rules.pl
CONFLICT (content): Merge conflict in admin/smart-rules.pl
Auto-merging installer/data/mysql/kohastructure.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/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.

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