Merge Conflict resolution

2023-12-07 02:28:57 -05:00
parent d7005479c5
commit 5ad4478670
3 changed files with 1 additions and 11 deletions
--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs
@ -44,12 +44,8 @@ if (app.Environment.IsDevelopment())
    app.UseSwagger();
    app.UseSwaggerUI();
 }
-<<<<<<< HEAD
 app.UseCors("DamageAppCorsPolicy");
 app.UseAuthorization();
-=======
-
->>>>>>> 9ec9b8b96fc7c5767fcddf1e4e52bde203fcf619

 // Enable CORS, authentication, and authorization middleware.
 app.UseCors("DamageAppCorsPolicy");