# Conflicts: # OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs |
||
|---|---|---|
| .. | ||
| CameraController.cs | ||
| FireCodeHController.cs | ||
| FireGridController.cs | ||
| FireManagementController.cs | ||
| FirePatrolController.cs | ||
| FireResourcesController.cs | ||
| HomeController.cs | ||
# Conflicts: # OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs |
||
|---|---|---|
| .. | ||
| CameraController.cs | ||
| FireCodeHController.cs | ||
| FireGridController.cs | ||
| FireManagementController.cs | ||
| FirePatrolController.cs | ||
| FireResourcesController.cs | ||
| HomeController.cs | ||