conflicts resolved

prisma/schema.prisma

@@ -0,0 +1,29 @@
+generator client {
+  provider = "prisma-client-js"
+}
+
+datasource db {
+  provider = "postgresql"
+  url      = env("DATABASE_URL")
+}
+
+model Article {
+  id          String   @id @default(uuid())
+  title       String
+  description String
+  likes       Int      @default(0)
+  dislikes    Int      @default(0)
+  comments    String[] @default([]) 
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+}
+
+model Charte {
+  id          String   @id @default(uuid())
+  name       String  
+  email      String  
+  comment    String?
+  createdAt   DateTime @default(now()) 
+}
+
+