Merge pull request #116 from SergeWilfried/fixconflicts

chore(prisma/schema.prisma): resolve merge conflict markers in User m…
SergeWilfried · Feb 29, 2024 · 7a7d907 · 7a7d907
2 parents 85abe65 + 662d428
commit 7a7d907
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
@@ -43,13 +43,9 @@ model User {
   twoFactorSecret      String?
   twoFactorEnabled     Boolean              @default(false)
   twoFactorBackupCodes String?
-<<<<<<< HEAD
-
-=======
   url                  String?              @unique
 
   userProfile       UserProfile?
->>>>>>> documenso-main
   VerificationToken VerificationToken[]
   ApiToken          ApiToken[]
   Template          Template[]

diff --git a/packages/trpc/server/router.ts b/packages/trpc/server/router.ts
@@ -27,12 +27,8 @@ export const appRouter = router({
   singleplayer: singleplayerRouter,
   team: teamRouter,
   template: templateRouter,
-<<<<<<< HEAD
-  twoFactorAuthentication: twoFactorAuthenticationRouter
-=======
   webhook: webhookRouter,
   twoFactorAuthentication: twoFactorAuthenticationRouter,
->>>>>>> documenso-main
 });
 
 export type AppRouter = typeof appRouter;