Resolve merge conflicts and remove generated Prisma files
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@ -41,3 +41,4 @@ yarn-error.log*
|
||||
next-env.d.ts
|
||||
|
||||
/src/generated/prisma
|
||||
prisma/generated/
|
||||
|
Reference in New Issue
Block a user