Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make all copies of 100x100-green.png identical #9172

Merged
merged 1 commit into from
Jan 24, 2018
Merged

Make all copies of 100x100-green.png identical #9172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified css/css-flexbox/support/100x100-green.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/css-grid/alignment/support/100x100-green.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/css-grid/grid-items/support/100x100-green.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions lint.whitelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,8 +585,6 @@ CSS-COLLIDING-SUPPORT-NAME: css/*/.htaccess
CSS-COLLIDING-SUPPORT-NAME: css/*/LOCK

# These are all the current "merge mismatch" errors the build system produces
CSS-COLLIDING-SUPPORT-NAME: css/css-flexbox/support/100x100-green.png
CSS-COLLIDING-SUPPORT-NAME: css/css-grid/grid-items/support/100x100-green.png
CSS-COLLIDING-SUPPORT-NAME: css/css-flexbox/support/200x200-green.png
CSS-COLLIDING-SUPPORT-NAME: css/css-grid/grid-items/support/200x200-green.png
CSS-COLLIDING-SUPPORT-NAME: css/css-regions/contentEditable/support/common.css
Expand Down