pengdi@zoniot.com d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 5 gadi atpakaļ
..
ConfigDataDto.class d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 5 gadi atpakaļ
DeviceData.class d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 5 gadi atpakaļ
UdipUnitDataDTO.class d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 5 gadi atpakaļ
ValveControlDataDto.class d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 5 gadi atpakaļ