Make all copies of 100x100-green.png identical

This gets rid of the CSS-COLLIDING-SUPPORT-NAME failure on master from 1f69b42 (see web-platform-tests#9171 for how that landed)
gsnedders · Jan 24, 2018 · e7d6f0d · e7d6f0d
1 parent cf8ec6b
commit e7d6f0d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 2 deletions.
diff --git a/css/css-flexbox/support/100x100-green.png b/css/css-flexbox/support/100x100-green.png
diff --git a/css/css-grid/alignment/support/100x100-green.png b/css/css-grid/alignment/support/100x100-green.png
diff --git a/css/css-grid/grid-items/support/100x100-green.png b/css/css-grid/grid-items/support/100x100-green.png
diff --git a/lint.whitelist b/lint.whitelist
@@ -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