[Koha-bugs] [Bug 11481] new reservation syspref HoldOnlyWhenAllItemsOnLoan

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

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

jmbroust <jean-manuel.broust at univ-lyon2.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |jean-manuel.broust at univ-lyo
                   |                            |n2.fr

--- Comment #4 from jmbroust <jean-manuel.broust at univ-lyon2.fr> ---
<h1>Something went wrong !</h1>Applying: Bug 11481 HoldOnlyWhenAllItemsOnLoan
new syspref
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Reserves.pm
Auto-merging installer/data/mysql/sysprefs.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/preferences/circulation.pref
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
Auto-merging opac/opac-detail.pl
Auto-merging reserve/request.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 11481 HoldOnlyWhenAllItemsOnLoan new syspref
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 11481 - new reservation syspref HoldOnlyWhenAllItemsOnLoan

24397 - Bug 11481 HoldOnlyWhenAllItemsOnLoan new syspref

-- 
You are receiving this mail because:
You are watching all bug changes.