Merge pull request #23 from holidaycheck/greenkeeper-eslint-2.10.2

Update eslint to version 2.10.2 🚀
holidaycheck · May 17, 2016 · 44780e7 · 44780e7
2 parents 6e857b0 + 15d4728
commit 44780e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/baseConfig.json b/baseConfig.json
@@ -147,11 +147,13 @@
         "no-unmodified-loop-condition": "error",
         "no-unneeded-ternary": "error",
         "no-unreachable": "error",
+        "no-unsafe-finally": "error",
         "no-unused-expressions": "error",
         "no-unused-labels": "error",
         "no-unused-vars": "error",
         "no-use-before-define": "error",
         "no-useless-call": "error",
+        "no-useless-computed-key": "error",
         "no-useless-concat": "off",
         "no-useless-constructor": "error",
         "no-useless-escape": "error",
@@ -225,6 +227,7 @@
         "newline-before-return": "off",
         "newline-per-chained-call": "off",
         "object-curly-spacing": [ "error", "always" ],
+        "object-property-newline": "off",
         "object-shorthand": "off",
         "one-var": [ "error", "always" ],
         "one-var-declaration-per-line": "off",

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     },
     "devDependencies": {
         "chai": "3.5.0",
-        "eslint": "2.8.0",
+        "eslint": "2.10.2",
         "espree": "3.1.4",
         "mocha": "2.4.5",
         "pr-log": "1.4.0"