[Koha-bugs] [Bug 32182] Replace static tabs markup with Bootstrap

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

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

David Nind <david at davidnind.com> changed:

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

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

git bz apply 32182

Bug 32182 - Replace static tabs markup with Bootstrap

143830 - Bug 32182: Replace static tabs markup with Bootstrap

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 32182: Replace static tabs markup with Bootstrap
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 32182: Replace static tabs markup with Bootstrap

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