[Koha-bugs] [Bug 30869] Stock rotation rotas cannot be deleted

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

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

David Nind <david at davidnind.com> changed:

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

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

root at kohadevbox:koha(bz30869)$ git bz apply 30869

Bug 30869 - Stock rotation rotas cannot be deleted

143148 - Add delete action to stock rotation rotas

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 30869: Stock rotation rotas cannot be deleted
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 30869: Stock rotation rotas cannot be deleted

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