fix: resolve conflict

jdf2e · Nov 15, 2024 · 6207bf7 · 6207bf7
1 parent 0cfaf5c
commit 6207bf7
Show file tree

Hide file tree

Showing 2 changed files with 12,328 additions and 3,065 deletions.
diff --git a/package.json b/package.json
@@ -162,7 +162,7 @@
     "@vitest/ui": "^2.0.4",
     "autoprefixer": "^10.4.17",
     "axios": "^1.6.7",
-    "cypress": "^13.15.0",
+    "cypress": "^13.15.2",
     "del": "^7.1.0",
     "eslint": "^8.56.0",
     "eslint-config-airbnb": "^19.0.4",