From 662d42847e38cd376f8a2f1f0fd1fd5fc0454a6c Mon Sep 17 00:00:00 2001
From: serge <sergewilfried@outlook.fr>
Date: Thu, 29 Feb 2024 10:57:05 +0000
Subject: [PATCH] chore(prisma/schema.prisma): resolve merge conflict markers
 in User model chore(trpc/server/router.ts): resolve merge conflict markers in
 appRouter definition

---
 packages/prisma/schema.prisma  | 4 ----
 packages/trpc/server/router.ts | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index dc59250f7b..b1bf9f9857 100644
--- 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
index af36bc886b..16f79f712c 100644
--- 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;