[Koha-bugs] [Bug 17656] Irregularities in serial prediction pattern are planned only for current subscription

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

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

--- Comment #120 from Alex Arnaud <alex.arnaud at biblibre.com> ---
(In reply to David Nind from comment #110)
> Patch no longer applies 8-(:
> 
> Apply? [(y)es, (n)o, (i)nteractive] y
> Applying: Bug 17656: Keep irregularities during subscription renewals
> Using index info to reconstruct a base tree...
> M	C4/Serials.pm
> M	koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
> M	koha-tmpl/intranet-tmpl/prog/css/staff-global.css
> Falling back to patching base and 3-way merge...
> Auto-merging koha-tmpl/intranet-tmpl/prog/css/staff-global.css
> CONFLICT (content): Merge conflict in
> koha-tmpl/intranet-tmpl/prog/css/staff-global.css
> Auto-merging koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
> Auto-merging C4/Serials.pm
> error: Failed to merge in the changes.
> Patch failed at 0001 Bug 17656: Keep irregularities during subscription
> renewals

Patches rebased

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