forked from MDCPS/DamageAssessment_Backend
		
	Merge Conflict resolution
This commit is contained in:
		| @ -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"); | ||||
|  | ||||
| @ -44,12 +44,10 @@ if (app.Environment.IsDevelopment()) | ||||
|     app.UseSwagger(); | ||||
|     app.UseSwaggerUI(); | ||||
| } | ||||
| <<<<<<< HEAD | ||||
| ======= | ||||
|  | ||||
|  | ||||
| // Enable CORS, authentication, and authorization middleware. | ||||
| >>>>>>> 9ec9b8b96fc7c5767fcddf1e4e52bde203fcf619 | ||||
|  | ||||
| app.UseCors("DamageAppCorsPolicy"); | ||||
| app.UseAuthorization(); | ||||
|  | ||||
|  | ||||
| @ -64,10 +64,6 @@ if (app.Environment.IsDevelopment()) | ||||
|     app.UseSwaggerUI(); | ||||
| } | ||||
|  | ||||
| <<<<<<< HEAD | ||||
| ======= | ||||
| // Enable CORS, authentication, and authorization middleware. | ||||
| >>>>>>> 9ec9b8b96fc7c5767fcddf1e4e52bde203fcf619 | ||||
| app.UseCors("DamageAppCorsPolicy"); | ||||
| app.UseAuthorization(); | ||||
|  | ||||
|  | ||||
		Reference in New Issue
	
	Block a user