There was an error while loading. Please reload this page.
2 parents 097e064 + dec6011 commit 285e2c6Copy full SHA for 285e2c6
3 files changed
backend/package.json
@@ -12,8 +12,12 @@
12
"test": "vitest run --passWithNoTests"
13
},
14
"dependencies": {
15
+<<<<<<< HEAD
16
"@google-cloud/firestore": "^7.11.1",
17
"@google/generative-ai": "^0.24.1",
18
+=======
19
+ "@google-cloud/firestore": "^8.5.0",
20
+>>>>>>> dec601151800bc8592830fcb25294e5f741f8b37
21
"cors": "^2.8.5",
22
"dotenv": "^16.4.7",
23
"express": "^4.21.2",
@@ -27,6 +31,6 @@
27
31
"@types/node": "^22.10.2",
28
32
"tsx": "^4.19.2",
29
33
"typescript": "^5.7.2",
30
- "vitest": "^2.1.8"
34
+ "vitest": "^4.1.5"
35
}
36
frontend/package.json
@@ -22,6 +22,6 @@
"eslint": "^9.17.0",
"eslint-config-next": "^15.0.0",
24
25
26
0 commit comments