Skip to content

Commit

Permalink
Merge pull request #117 from SergeWilfried/fixconflicts
Browse files Browse the repository at this point in the history
fix: conflicts
  • Loading branch information
SergeWilfried authored Feb 29, 2024
2 parents 7a7d907 + 17c607c commit 00cf299
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions packages/prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"types": "./index.ts",
"license": "MIT",
"scripts": {
"build": "prisma generate",
"build": "npx prisma generate",
"format": "prisma format",
"clean": "rimraf node_modules",
"post-install": "prisma generate",
"prisma:generate": "prisma generate",
"prisma:migrate-dev": "prisma migrate dev",
"prisma:migrate-deploy": "prisma migrate deploy",
"post-install": "npx prisma generate",
"prisma:generate": "npx prisma generate",
"prisma:migrate-dev": "npx prisma migrate dev",
"prisma:migrate-deploy": "npx prisma migrate deploy",
"prisma:seed": "prisma db seed"
},
"prisma": {
Expand Down

0 comments on commit 00cf299

Please sign in to comment.