chore: remove conflict markers

captableinc · Jul 23, 2024 · f336c96 · f336c96
1 parent 5fba51e
commit f336c96
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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