conflicts resolved

2024-12-20 12:22:35 +01:00
parent b9719e0c98
commit 6d6d70295d
45 changed files with 3200 additions and 1709 deletions
--- a/prisma/migrations/migration_lock.toml
+++ b/prisma/migrations/migration_lock.toml
@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"