[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

Alex Buckley <alexbuckley at catalyst.net.nz> changed:

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

--- Comment #80 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Sorry the patches could not apply, can you please rebase

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/staff-global.css
M      
koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt
M       serials/subscription-add.pl
Falling back to patching base and 3-way merge...
Auto-merging serials/subscription-add.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt
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 C4/Serials.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 17656 - Keep irregularities during subscription
renewals
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.git/rebase-apply/patch
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".
Patch left in
/tmp/Bug-17656---Keep-irregularities-during-subscriptio-4ETfMG.patch

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