Fix merge conflicts

2 files changed, 2 insertions, 2 deletions

diff --git a/src/api/routes/users/@me/mfa/codes.ts b/src/api/routes/users/@me/mfa/codes.ts

index e43f6859..8d90f993 100644
--- a/src/api/routes/users/@me/mfa/codes.ts
+++ b/src/api/routes/users/@me/mfa/codes.ts
@@ -1,4 +1,3 @@
-import { Router, Request, Response } from "express";
 import { route } from "@fosscord/api";
 import { BackupCode, Config, FieldErrors, generateMfaBackupCodes, MfaCodesSchema, User } from "@fosscord/util";
 import { Request, Response, Router } from "express";
diff --git a/src/api/routes/users/@me/mfa/totp/enable.ts b/src/api/routes/users/@me/mfa/totp/enable.ts

index 413291b8..a38a133a 100644
--- a/src/api/routes/users/@me/mfa/totp/enable.ts
+++ b/src/api/routes/users/@me/mfa/totp/enable.ts
@@ -2,6 +2,7 @@ import { BackupCode, Config, generateMfaBackupCodes, generateToken, TotpEnableSc
 import { Request, Response, Router } from "express";
 import { HTTPError } from "lambert-server";
 import { verifyToken } from 'node-2fa';
+import { route } from '@fosscord/api';
 
 let bcrypt: any;
 try {
@@ -51,4 +52,4 @@ router.post("/", route({ body: "TotpEnableSchema" }), async (req: Request, res:
 	});
 });
 
-export default router;
\ No newline at end of file
+export default router;