]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #17370 from twbs/v4-dev-xmr-rm-csslint-references
authorMark Otto <markd.otto@gmail.com>
Wed, 2 Sep 2015 03:23:13 +0000 (20:23 -0700)
committerMark Otto <markd.otto@gmail.com>
Wed, 2 Sep 2015 03:23:13 +0000 (20:23 -0700)
Remove CSSLint references.

1  2 
package.json
test-infra/npm-shrinkwrap.json

diff --cc package.json
index f6a8e1e1fa3fda32b0938be6867f767700b2ea63,1e10835b63a7cfb853961b65839cb0390aee3565..3f0e37f09de371bb4c5573d69b315406e9444f18
@@@ -41,8 -41,8 +41,7 @@@
      "grunt-contrib-concat": "~0.5.1",
      "grunt-contrib-connect": "~0.9.0",
      "grunt-contrib-copy": "~0.8.0",
-     "grunt-contrib-csslint": "~0.4.0",
      "grunt-contrib-cssmin": "~0.12.2",
 -    "grunt-contrib-jade": "~0.14.1",
      "grunt-contrib-qunit": "~0.5.2",
      "grunt-contrib-sass": "^0.8.1",
      "grunt-contrib-uglify": "~0.8.0",
Simple merge