https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30167 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |david@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #3 from David Nind <david@davidnind.com> --- Patch no longer applies 8-(.. git bz apply 30167 Bug 30167 - Return soonest renewal date when CanBookBeRenewed returns %too_soon 131046 - Bug 30167: Return soonest renewal date when renewal is to soon 131047 - Bug 30167: Use returned renewal date rather than fetching Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 30167: Return soonest renewal date when renewal is to soon Using index info to reconstruct a base tree... M C4/Circulation.pm 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 C4/Circulation.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 30167: Return soonest renewal date when renewal is to soon -- You are receiving this mail because: You are watching all bug changes.