fixing merge conflicts

stackai · Dec 11, 2023 · 2f4071a · 2f4071a
2 parents 66b79d9 + 8dc282c
commit 2f4071a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.3",
     "typescript": "^5.0.2",
-    "vite": "^4.4.5",
+    "vite": "^4.5.1",
     "react-merge-refs": "^2.1.1",
     "react-stackai": "^0.1.6"
   }