fix: fixed merge related conflicting data

2023-01-23 15:03:03 +05:30 · 2023-01-23 15:03:03 +05:30 · 863e1ee113
commit 863e1ee113
parent f7070dd3f7
1 changed files with 0 additions and 5 deletions
--- a/packages/hoppscotch-backend/prisma/schema.prisma
+++ b/packages/hoppscotch-backend/prisma/schema.prisma
@ -101,11 +101,6 @@ model UserHistory {
 enum ReqType {
  REST
  GQL
-  uid              String            @id @default(cuid())
-  displayName      String?
-  email            String?
-  photoURL         String?
-  UserEnvironments UserEnvironment[]
 }

 model UserEnvironment {