# Conflicts: # DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache |
||
|---|---|---|
| .. | ||
| device_data.cs | ||
| device_info.cs | ||
| device_operation.cs | ||
| electricity_data.cs | ||
| electricity_price.cs | ||
# Conflicts: # DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache |
||
|---|---|---|
| .. | ||
| device_data.cs | ||
| device_info.cs | ||
| device_operation.cs | ||
| electricity_data.cs | ||
| electricity_price.cs | ||