# Conflicts: # OpenAuth.App/ServiceApp/ManageApp.cs |
||
|---|---|---|
| .. | ||
| AirportMaintenanceController.cs | ||
| DroneDockController.cs | ||
| ManageController.cs | ||
# Conflicts: # OpenAuth.App/ServiceApp/ManageApp.cs |
||
|---|---|---|
| .. | ||
| AirportMaintenanceController.cs | ||
| DroneDockController.cs | ||
| ManageController.cs | ||