Merge remote-tracking branch 'origin/main'

SimPaypl · Oct 11, 2024 · 1c3d556 · 1c3d556
2 parents af56c65 + 06ba70a
commit 1c3d556
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,9 +46,15 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.16.4",
+<<<<<<< HEAD
     "@biomejs/biome": "1.9.3",
     "@changesets/cli": "^2.27.9",
     "@types/node": "^22.7.5",
+=======
+    "@biomejs/biome": "1.9.2",
+    "@changesets/cli": "^2.27.8",
+    "@types/node": "^22.5.5",
+>>>>>>> origin/main
     "ts-node": "^10.9.2",
     "typescript": "^5.6.3"
   },