[Koha-bugs] [Bug 25193] Add syspref to control location for use of AllowRenewalIfOtherItemsAvailable

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25193

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |david at davidnind.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #22 from David Nind <david at davidnind.com> ---
The patch no longer applies 8-(....

git bz apply 25193

Bug 25193 - Add syspref to control location for use of
AllowRenewalIfOtherItemsAvailable

161126 - Bug 25193: Add AllowRenewalIfOtherItemsAvailableLocation syspref

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 25193: Add AllowRenewalIfOtherItemsAvailableLocation syspref
Using index info to reconstruct a base tree...
M       C4/Circulation.pm
M       installer/data/mysql/mandatory/sysprefs.sql
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
M       t/db_dependent/Circulation.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Circulation.t
CONFLICT (content): Merge conflict in t/db_dependent/Circulation.t
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging installer/data/mysql/mandatory/sysprefs.sql
Auto-merging C4/Circulation.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 25193: Add AllowRenewalIfOtherItemsAvailableLocation
syspref

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