Skip to content

Commit

Permalink
🪡 fixed merge conflicts with main
Browse files Browse the repository at this point in the history
  • Loading branch information
Gyoumi committed Dec 8, 2024
2 parents c9cb27f + 7e5d5ef commit a2710a1
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"@types/express": "4",
"@types/express-session": "^1.18.0",
"@types/node": "^22.7.7",
"@types/node-cron": "^3.0.11",
"jest-mock-extended": "2.0.4",
"prisma": "^5.22.0",
"supertest": "^7.0.0",
Expand Down

0 comments on commit a2710a1

Please sign in to comment.