Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend

node_modules/.package-lock.json

@@ -9955,6 +9955,8 @@
         "node": ">=0.10.0"
       }
     },
+<<<<<<< HEAD
+=======
     "node_modules/strtok3": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0.tgz",
@@ -9971,6 +9973,7 @@
         "url": "https://github.com/sponsors/Borewit"
       }
     },
+>>>>>>> 127251e2ebfc5c15d56a359b7f12754359034ee7
     "node_modules/stubs": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",

package-lock.json

@@ -10026,6 +10026,8 @@
         "node": ">=0.10.0"
       }
     },
+<<<<<<< HEAD
+=======
     "node_modules/strtok3": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0.tgz",
@@ -10042,6 +10044,7 @@
         "url": "https://github.com/sponsors/Borewit"
       }
     },
+>>>>>>> 127251e2ebfc5c15d56a359b7f12754359034ee7
     "node_modules/stubs": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
@@ -18867,6 +18870,8 @@
         "is-utf8": "^0.2.0"
       }
     },
+<<<<<<< HEAD
+=======
     "strtok3": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0.tgz",
@@ -18876,6 +18881,7 @@
         "peek-readable": "^5.0.0"
       }
     },
+>>>>>>> 127251e2ebfc5c15d56a359b7f12754359034ee7
     "stubs": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",