pengdi@zoniot.com d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 3 rokov pred
..
JobTaskMapper.xml 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 3 rokov pred
MeterReadRecordMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 3 rokov pred
WaterMeterMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 3 rokov pred