From 50fae125ed219da81e9f9ba9961ab71244ee53a6 Mon Sep 17 00:00:00 2001
From: Josh Johnson <josh@joshuajohnson.co.uk>
Date: Mon, 28 Oct 2019 20:26:03 +0000
Subject: [PATCH] Resolve on save vscode conflict (#714)

---
 .vscode/settings.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4701368..71464a5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,7 +2,6 @@
   "eslint.enable": true,
   // prevent watch task failures on lint errors
   "eslint.autoFixOnSave": true,
-  "editor.formatOnSave": true,
   // switch off default VSCode formatting rules
   "javascript.format.enable": false,
   // Javascript prettier runs via ESLint
@@ -16,6 +15,9 @@
   "[scss]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
+  "[javascript]": {
+    "editor.formatOnSave": false
+  },
   "search.exclude": {
     "**/node_modules": true,
     "public/assets": true,