From 363d9887cf4956f566485d872f9ba51155198a6f Mon Sep 17 00:00:00 2001
From: TheArcaneBrony <myrainbowdash949@gmail.com>
Date: Sat, 20 Aug 2022 03:19:35 +0200
Subject: Fix merge conflicts

---
 src/api/routes/users/@me/disable.ts         | 1 +
 src/api/routes/users/@me/index.ts           | 2 --
 src/api/routes/users/@me/mfa/codes.ts       | 1 -
 src/api/routes/users/@me/mfa/totp/enable.ts | 3 ++-
 4 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/api/routes/users/@me/disable.ts b/src/api/routes/users/@me/disable.ts
index 477d433c..3a1d48b8 100644
--- a/src/api/routes/users/@me/disable.ts
+++ b/src/api/routes/users/@me/disable.ts
@@ -1,5 +1,6 @@
 import { User } from "@fosscord/util";
 import { Request, Response, Router } from "express";
+import { route } from "@fosscord/api";
 
 let bcrypt: any;
 try {
diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts
index f193a368..4421d54f 100644
--- a/src/api/routes/users/@me/index.ts
+++ b/src/api/routes/users/@me/index.ts
@@ -1,5 +1,3 @@
-import { Router, Request, Response } from "express";
-import { User, PrivateUserProjection, emitEvent, UserUpdateEvent, handleFile, FieldErrors, UserModifySchema } from "@fosscord/util";
 import { route } from "@fosscord/api";
 import {
 	emitEvent,
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;
-- 
cgit 1.5.1