fixed merge conflicts

This commit is contained in:
2025-09-26 17:01:45 +02:00
parent 8f6634b03f
commit 8980d98394
14 changed files with 3 additions and 588 deletions
@@ -100,7 +100,6 @@
* type: string
* format: email
*
<<<<<<< HEAD
* ForgotPasswordRequest:
* type: object
* required:
@@ -132,8 +131,6 @@
* message:
* type: string
*
=======
>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
* Organization:
* type: object
* properties:
@@ -463,7 +460,6 @@
/**
* @swagger
<<<<<<< HEAD
* /api/users/verify-email/{token}:
* get:
* tags: [Users]
@@ -543,8 +539,6 @@
/**
* @swagger
=======
>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
* /api/organizations/search:
* get:
* tags: [Organizations]