Skip to content

Commit c3f315a

Browse files
committed
chore: fixing issue with merge conflict
1 parent af0d020 commit c3f315a

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

package-lock.json

+14-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@typescript-eslint/eslint-plugin": "^5.61.0",
3232
"@typescript-eslint/parser": "^5.61.0",
3333
"eslint-plugin-jsx-a11y": "^6.7.1",
34-
"prisma": "^4.16.2"
34+
"prisma": "^4.16.2",
3535
"@types/node": "20.4.1",
3636
"@types/react": "18.2.14",
3737
"@types/react-dom": "18.2.6",

0 commit comments

Comments
 (0)