From f336c96732c751c36c286252a0bd50ece863c030 Mon Sep 17 00:00:00 2001
From: Raju kadel <rajukadel.github@gmail.com>
Date: Sat, 20 Jul 2024 01:03:15 +0545
Subject: [PATCH] chore: remove conflict markers

---
 src/trpc/api/root.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/trpc/api/root.ts b/src/trpc/api/root.ts
index ded583226..b6c359a21 100644
--- a/src/trpc/api/root.ts
+++ b/src/trpc/api/root.ts
@@ -54,11 +54,8 @@ export const appRouter = createTRPCRouter({
   billing: billingRouter,
   rbac: rbacRouter,
   apiKey: apiKeyRouter,
-<<<<<<< HEAD
   bankAccounts: bankAccountsRouter,
-=======
   twoFactorAuth: twoFactorAuthRouter,
->>>>>>> 9093b09 (feat: register 2fa router in root)
 });
 
 // export type definition of API