[Koha-bugs] [Bug 5786] Move AllowOnShelfHolds system preference to the Circulation Matrix

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

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

Christophe Croullebois <christophe.croullebois at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #35 from Christophe Croullebois <christophe.croullebois at biblibre.com> ---
Sry Srdjan,
I have these conflicts:
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
CONFLICT (content): Merge conflict in opac/opac-ISBDdetail.pl
CONFLICT (content): Merge conflict in opac/opac-MARCdetail.pl
Could you check, or explain me what I made wrong ?
thx

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-bugs/attachments/20120302/bb0518cd/attachment.htm>