Merge 022a091 into 9068a0f

BerkeleyTrue · Jul 5, 2017 · 5dfa0aa · 5dfa0aa
2 parents 9068a0f + 022a091
commit 5dfa0aa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,7 +1,4 @@
 {
-  "parserOption": {
-    "ecmaVersion": 6
-  },
   "env": {
     "es6": true,
     "node": true

diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "coveralls": "^2.11.14",
     "cz-conventional-changelog": "^2.0.0",
     "enzyme": "^2.4.1",
-    "eslint": "^3.5.0",
+    "eslint": "^4.1.0",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-react": "^7.0.0",
     "nodemon": "^1.11.0",