Merge remote-tracking branch 'origin/main'

SerpentRace_Backend/src/Api/routers/userRouter.ts

@@ -198,6 +198,7 @@ userRouter.post('/logout', authRequired, async (req, res) => {
 		return ErrorResponseService.sendInternalServerError(res);
 	}
 });
+<<<<<<< HEAD
 
 // Refresh token endpoint
 userRouter.post('/refresh-token', async (req, res) => {
@@ -336,4 +337,6 @@ userRouter.post('/reset-password',
 	}
 });
 
+=======
+>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 export default userRouter;