pengdi@zoniot.com 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. hace 4 años
..
JobResult.class 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. hace 4 años
JobTask.class 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. hace 4 años
MeasuringData.class 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. hace 4 años
MeterReadRecord.class 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. hace 4 años
WaterMeter.class 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. hace 4 años