From 65a804dc01ae92b426ac9fdd7614e9b30a2378fb Mon Sep 17 00:00:00 2001
From: Alex <clodan@noreply.dev.sp-tarkov.com>
Date: Sun, 28 Apr 2024 14:47:55 +0000
Subject: [PATCH] pushing merge conflict resolution to previous commit (!312)

Co-authored-by: clodan <clodan@clodan.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/312
Co-authored-by: Alex <clodan@noreply.dev.sp-tarkov.com>
Co-committed-by: Alex <clodan@noreply.dev.sp-tarkov.com>
---
 project/src/routers/dynamic/BotDynamicRouter.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/project/src/routers/dynamic/BotDynamicRouter.ts b/project/src/routers/dynamic/BotDynamicRouter.ts
index 0e975dc4..92abf614 100644
--- a/project/src/routers/dynamic/BotDynamicRouter.ts
+++ b/project/src/routers/dynamic/BotDynamicRouter.ts
@@ -25,18 +25,13 @@ export class BotDynamicRouter extends DynamicRouter
                 },
             ),
             new RouteAction(
-<<<<<<< HEAD
-                "/singleplayer/settings/bot/difficulties/",
+                "/singleplayer/settings/bot/difficulties",
                 async (
                     url: string,
                     info: any,
                     sessionID: string,
                     output: string,
                 ): Promise<Record<string, Difficulties>> =>
-=======
-                "/singleplayer/settings/bot/difficulties",
-                (url: string, info: any, sessionID: string, output: string): any =>
->>>>>>> 3.9.0-DEV
                 {
                     return this.botCallbacks.getAllBotDifficulties(url, info, sessionID);
                 },