Merge remote-tracking branch 'upstream/main' into feature/oidc-user-link

2 weeks ago · 8f2ac9c1a9
2 changed files with 3 additions and 3 deletions
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@ -1,8 +1,8 @@
 {
  "recommendations": [
    "angular.ng-template",
-    "esbenp.prettier-vscode",
    "firsttris.vscode-jest-runner",
-    "nrwl.angular-console"
+    "nrwl.angular-console",
+    "prettier.prettier-vscode"
  ]
 }
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,4 +1,4 @@
 {
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.defaultFormatter": "prettier.prettier-vscode",
  "editor.formatOnSave": true
 }