From 8f6634b03fdd3c24b8642a790927a1e17552956c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Don=C3=A1t?= <magdon2016a@outlook.hu>
Date: Fri, 26 Sep 2025 16:59:55 +0200
Subject: [PATCH] fixed merge conflicts

---
 SerpentRace_Backend/node_modules/jest/bin/jest.js | 2 ++
 SerpentRace_Backend/src/Api/routers/deckRouter.ts | 1 -
 SerpentRace_Backend/src/Api/routers/userRouter.ts | 3 ---
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/SerpentRace_Backend/node_modules/jest/bin/jest.js b/SerpentRace_Backend/node_modules/jest/bin/jest.js
index f3be8f9d..834da754 100644
--- a/SerpentRace_Backend/node_modules/jest/bin/jest.js
+++ b/SerpentRace_Backend/node_modules/jest/bin/jest.js
@@ -1,4 +1,6 @@
 #!/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.
  *
diff --git a/SerpentRace_Backend/src/Api/routers/deckRouter.ts b/SerpentRace_Backend/src/Api/routers/deckRouter.ts
index e8e34282..fe35d6cb 100644
--- a/SerpentRace_Backend/src/Api/routers/deckRouter.ts
+++ b/SerpentRace_Backend/src/Api/routers/deckRouter.ts
@@ -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) => {
 	try {
 		const deckId = req.params.id;
diff --git a/SerpentRace_Backend/src/Api/routers/userRouter.ts b/SerpentRace_Backend/src/Api/routers/userRouter.ts
index d5de2bc3..ffa7e6e8 100644
--- a/SerpentRace_Backend/src/Api/routers/userRouter.ts
+++ b/SerpentRace_Backend/src/Api/routers/userRouter.ts
@@ -197,7 +197,6 @@ userRouter.post('/logout', authRequired, async (req, res) => {
 		return ErrorResponseService.sendInternalServerError(res);
 	}
 });
-<<<<<<< HEAD
 
 // Refresh token endpoint
 userRouter.post('/refresh-token', async (req, res) => {
@@ -336,6 +335,4 @@ userRouter.post('/reset-password',
 	}
 });
 
-=======
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 export default userRouter;