Merge remote-tracking branch 'upstream/master' into prettier-properties

# Conflicts: # package-lock.json # package.json
AirQuick · Dec 11, 2023 · 61ec8b3 · 61ec8b3
2 parents 0c2d461 + 48e934d
commit 61ec8b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "@commitlint/cli": "^18.4.3",
     "@commitlint/config-angular": "^18.4.3",
     "bats": "^1.10.0",
-    "prettier": "^3.1.0",
+    "prettier": "^3.1.1",
     "prettier-plugin-properties": "^0.3.0"
   },
   "scripts": {