fix merge conflicts

2022-01-08 15:08:19 -05:00
parent 4def7e1ac5 bd9224fec9
commit fbf1cf16e2
5 changed files with 26 additions and 4 deletions
--- a/app/api/db/schema.prisma
+++ b/app/api/db/schema.prisma
@@ -5,7 +5,7 @@ datasource db {

 generator client {
  provider      = "prisma-client-js"
-  binaryTargets = "native"
+  binaryTargets = ["native", "darwin-arm64", "darwin"]
 }

 // sqlLight does not suport enums so we can't use enums until we set up postgresql in dev mode