From 558ab390e1c0a464f1d55f55052b6eee94c177e8 Mon Sep 17 00:00:00 2001
From: Balan Veniamin <veniamin.balan02@gmail.com>
Date: Sun, 29 Oct 2023 18:46:01 +0200
Subject: [PATCH] api version fixed

---
 GdscBackend/Features/Contacts/ContactController.cs | 2 +-
 GdscBackend/Features/Events/EventsController.cs    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/GdscBackend/Features/Contacts/ContactController.cs b/GdscBackend/Features/Contacts/ContactController.cs
index e668008..5094ae6 100644
--- a/GdscBackend/Features/Contacts/ContactController.cs
+++ b/GdscBackend/Features/Contacts/ContactController.cs
@@ -11,7 +11,7 @@ namespace GdscBackend.Features.Contacts;
 
 [ApiController]
 [Authorize(AuthorizeConstants.CoreTeam)]
-[ApiVersion("v1")]
+[ApiVersion("1")]
 [Route("v1/contact")]
 public class ContactController : ControllerBase
 {
diff --git a/GdscBackend/Features/Events/EventsController.cs b/GdscBackend/Features/Events/EventsController.cs
index 8a53327..6375049 100644
--- a/GdscBackend/Features/Events/EventsController.cs
+++ b/GdscBackend/Features/Events/EventsController.cs
@@ -28,11 +28,6 @@ public EventsController(IRepository<EventModel> repository, IMapper mapper,
         _filesRepository = filesRepository;
     }
 
-/*<<<<<<< HEAD
-
-=======
-
->>>>>>> dev*/
     [HttpPost]
     [ProducesResponseType(StatusCodes.Status201Created)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]