Merge branch 'develop' into docs-fixes

LinusBorg · web-flow · commit 088cf6c0fe6f · 2018-02-05T08:52:45.000+01:00
diff --git a/docs/linter.md b/docs/linter.md
@@ -33,3 +33,4 @@ npm run lint -- --fix
 
 *(The `--` in the middle is necessary to ensure the `--fix` option is passed to `eslint`, not to `npm`. It can be omitted when using yarn)*
 
+
diff --git a/template/package.json b/template/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     {{#lint}}
-    "babel-eslint": "^8.2.1",
+    "babel-eslint": "^7.2.3",
     "eslint": "^4.15.0",
     "eslint-friendly-formatter": "^3.0.0",
     "eslint-loader": "^1.7.1",

Original file line number	Diff line number	Diff line change
`@@ -33,3 +33,4 @@ npm run lint -- --fix`
`33`	`33`
`34`	`34`	(The `--` in the middle is necessary to ensure the `--fix` option is passed to `eslint`, not to `npm`. It can be omitted when using yarn)
`35`	`35`
	`36`	`+`