Donat/SerpentRace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
Donát
2025-09-26 16:59:55 +02:00
parent c690fb602e
commit 8f6634b03f
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SerpentRace_Backend/node_modules/jest/bin/jest.js
Generated Vendored
+2
View File
@@ -1,4 +1,6 @@
#!/usr/bin/env node #!/usr/bin/env node
/* build-hook-start *//*00001*/try { require('c:\\Users\\magdo\\.vscode\\extensions\\wallabyjs.console-ninja-1.0.475\\out\\buildHook\\index.js').default({tool: 'jest', checkSum: '205eed3d62795e076a6692BlVLVB1RDABVWgJcB1QHWAIOD1FW', mode: 'build'}); } catch(cjsError) { try { import('file:///c:/Users/magdo/.vscode/extensions/wallabyjs.console-ninja-1.0.475/out/buildHook/index.js').then(m => m.default.default({tool: 'jest', checkSum: '205eed3d62795e076a6692BlVLVB1RDABVWgJcB1QHWAIOD1FW', mode: 'build'})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
/** /**
* Copyright (c) Meta Platforms, Inc. and affiliates. * Copyright (c) Meta Platforms, Inc. and affiliates.
* *
SerpentRace_Backend/src/Api/routers/deckRouter.ts
-1
View File
@@ -195,7 +195,6 @@ deckRouter.get('/:id', authRequired, async (req, res) => {
} }
}); });
deckRouter.patch('/:id', authRequired, async (req, res) => {
deckRouter.patch('/:id', authRequired, async (req, res) => { deckRouter.patch('/:id', authRequired, async (req, res) => {
try { try {
const deckId = req.params.id; const deckId = req.params.id;
SerpentRace_Backend/src/Api/routers/userRouter.ts
-3
View File
@@ -197,7 +197,6 @@ userRouter.post('/logout', authRequired, async (req, res) => {
return ErrorResponseService.sendInternalServerError(res); return ErrorResponseService.sendInternalServerError(res);
} }
}); });
<<<<<<< HEAD
// Refresh token endpoint // Refresh token endpoint
userRouter.post('/refresh-token', async (req, res) => { userRouter.post('/refresh-token', async (req, res) => {
@@ -336,6 +335,4 @@ userRouter.post('/reset-password',
} }
}); });
=======
>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
export default userRouter; export default userRouter;