Problem/Motivation

Git conflict of CSS and JS files are there in admin_toolbar_search submodule

Steps to reproduce

admin_toolbar-8.x-2.3 or admin_toolbar-8.x-2.x-dev versions have the conflicted files.

admin_toolbar/admin_toolbar_search/css/admin.toolbar_search.css.orig
admin_toolbar/admin_toolbar_search/js/admin_toolbar_search.js.orig

Proposed resolution

These two conflict files need to be deleted

Remaining tasks

None

User interface changes

None

API changes

None

Data model changes

None

CommentFileSizeAuthor
#2 admin_toolbar-remove_conflict_files-3166600-2-8.x-2.x.patch5.02 KBsivaprasadc

Comments

SivaprasadC created an issue. See original summary.

sivaprasadc’s picture

sivaprasadc commented
Assigned: sivaprasadc » Unassigned
Status: Active » Needs review
StatusFileSize
new admin_toolbar-remove_conflict_files-3166600-2-8.x-2.x.patch5.02 KB

Hi,

I have attached the patch file.

romainj’s picture

romainj commented

Patch #2 works for me.

  • romainj committed 588de64 on 8.x-2.x authored by SivaprasadC 
    Issue #3166600 by SivaprasadC, romainj: Css and js Conflict files(.orig...
romainj’s picture

romainj commented

Commited in the latest dev version. Thanks @SivaprasadC.

romainj’s picture

romainj commented
Status: Needs review » Fixed

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.