Merge branch 'indent-fix' of https://github.com/SimenB/webpack into SimenB-indent-fix

This commit is contained in:
Tobias Koppers 2016-06-20 21:30:07 +02:00
commit e74b2f9390
10 changed files with 29 additions and 34 deletions

View File

@ -2,15 +2,11 @@
"env": {
"node": true
},
"plugins": [
"nodeca"
],
"rules": {
"strict": 0,
"camelcase": 0,
"curly": 0,
"indent": [0, "tab"],
"nodeca/indent": [2, "tabs", 1 ],
"indent": [2, "tab", { "SwitchCase": 1 }],
"eol-last": 1,
"no-shadow": 0,
"no-redeclare": 2,

View File

@ -36,7 +36,6 @@
"diff": "^2.0.2",
"es6-promise-polyfill": "^1.1.1",
"eslint": "^1.1.0",
"eslint-plugin-nodeca": "^1.0.3",
"express": "~4.13.1",
"extract-text-webpack-plugin": "^1.0.0",
"file-loader": "~0.8.0",