| .. | 
		
		
			
				
					| service | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| web | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| MeterReadingServiceApplication.class | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago |