[Koha-bugs] [Bug 7825] Change OPACItemHolds syspref to be of type Choice, choices being "no", "yes", "force"

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #8 from delaye <stephane.delaye@biblibre.com> --- i want test in a sandbox (biblibre) but i have the message CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt -- You are receiving this mail because: You are watching all bug changes.