Merge branch 'main' into dependabot/npm_and_yarn/tailwindcss-3.1.4

Cheffheid · web-flow · commit abdf8acafb48 · 2022-06-24T14:23:19.000-04:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,5 +11,6 @@
   // This will get emmet working in JSX.
   "emmet.includeLanguages": {
     "javascript": "javascriptreact"
-  }
+  },
+  "javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": false
 }

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,6 @@`
`11`	`11`	`// This will get emmet working in JSX.`
`12`	`12`	`"emmet.includeLanguages": {`
`13`	`13`	`"javascript": "javascriptreact"`
`14`		`- }`
	`14`	`+ },`
	`15`	`+ "javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": false`
`15`	`16`	`}`