Merge pull request #89 from gdsc-upt/tmp

small fixes
gdsc-upt · Oct 29, 2023 · a4d4612 · a4d4612
2 parents 2253f57 + 558ab39
commit a4d4612
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -28,11 +28,6 @@ public EventsController(IRepository<EventModel> repository, IMapper mapper,
         _filesRepository = filesRepository;
     }
 
-/*<<<<<<< HEAD
-
-=======
-
->>>>>>> dev*/
     [HttpPost]
     [ProducesResponseType(StatusCodes.Status201Created)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]