You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

ashok 25d489f0c9 Resolved conflict in package-lock.json		12 months ago
node_modules	Resolved conflict in package-lock.json	12 months ago
src	change in saving conxumption at midnight	12 months ago
.gitignore	profilepicture stored in cloud	2 years ago
package-lock.json	Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend	12 months ago
package.json	Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend	12 months ago