470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pushing merge conflict resolution to previous commit (!312)

Browse Source 
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>
This commit is contained in:
Alex 2024-04-28 14:47:55 +00:00 committed by chomp
parent cee7ef2e47
commit 65a804dc01
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
project/src/routers/dynamic/BotDynamicRouter.ts
View File

@ -25,18 +25,13 @@ export class BotDynamicRouter extends DynamicRouter
}, },
), ),
new RouteAction( new RouteAction(
<<<<<<< HEAD "/singleplayer/settings/bot/difficulties",
"/singleplayer/settings/bot/difficulties/",
async ( async (
url: string, url: string,
info: any, info: any,
sessionID: string, sessionID: string,
output: string, output: string,
): Promise<Record<string, Difficulties>> => ): 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); return this.botCallbacks.getAllBotDifficulties(url, info, sessionID);
}, },