[Koha-bugs] [Bug 29052] Make consistent use of spans and div with hint class

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

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

David Nind <david at davidnind.com> changed:

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

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

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 29052: Make consistent use of spans and div with hint class
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
error: Failed to merge in the changes.
Patch failed at 0001 Bug 29052: Make consistent use of spans and div with hint
class

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