[Koha-bugs] [Bug 29960] Remove Modernizr dependency in the OPAC

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

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

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-(...

Applying: Bug 29960: Remove Modernizr dependency in the OPAC
Using index info to reconstruct a base tree...
M       koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
Falling back to patching base and 3-way merge...
Removing koha-tmpl/opac-tmpl/bootstrap/lib/modernizr.min.js
Removing koha-tmpl/opac-tmpl/bootstrap/js/script.js
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
error: Failed to merge in the changes.
Patch failed at 0001 Bug 29960: Remove Modernizr dependency in the OPAC

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