santhoshsnair/DamageAssessment_Backend
1
0
Fork 0
forked from MDCPS/DamageAssessment_Backend
Code Pull Requests Activity

Merge Conflict resolution

Browse Source
This commit is contained in:
Reginald Cherenfant Jasmin 2023-12-07 02:28:57 -05:00
parent d7005479c5
commit 5ad4478670
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs
View File

@ -44,12 +44,8 @@ if (app.Environment.IsDevelopment())
app.UseSwagger(); app.UseSwagger();
app.UseSwaggerUI(); app.UseSwaggerUI();
} }
<<<<<<< HEAD
app.UseCors("DamageAppCorsPolicy"); app.UseCors("DamageAppCorsPolicy");
app.UseAuthorization(); app.UseAuthorization();
=======
>>>>>>> 9ec9b8b96fc7c5767fcddf1e4e52bde203fcf619
// Enable CORS, authentication, and authorization middleware. // Enable CORS, authentication, and authorization middleware.
app.UseCors("DamageAppCorsPolicy"); app.UseCors("DamageAppCorsPolicy");

4
DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs
View File

@ -44,12 +44,10 @@ if (app.Environment.IsDevelopment())
app.UseSwagger(); app.UseSwagger();
app.UseSwaggerUI(); app.UseSwaggerUI();
} }
<<<<<<< HEAD
=======
// Enable CORS, authentication, and authorization middleware. // Enable CORS, authentication, and authorization middleware.
>>>>>>> 9ec9b8b96fc7c5767fcddf1e4e52bde203fcf619
app.UseCors("DamageAppCorsPolicy"); app.UseCors("DamageAppCorsPolicy");
app.UseAuthorization(); app.UseAuthorization();

4
DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs
View File

@ -64,10 +64,6 @@ if (app.Environment.IsDevelopment())
app.UseSwaggerUI(); app.UseSwaggerUI();
} }
<<<<<<< HEAD
=======
// Enable CORS, authentication, and authorization middleware.
>>>>>>> 9ec9b8b96fc7c5767fcddf1e4e52bde203fcf619
app.UseCors("DamageAppCorsPolicy"); app.UseCors("DamageAppCorsPolicy");
app.UseAuthorization(); app.UseAuthorization();