diff --git a/index.html b/index.html index 2b7e547..738b61a 100644 --- a/index.html +++ b/index.html @@ -1010,7 +1010,7 @@ - + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 3debbfd..d86e7f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,15 +18,11 @@ "@tensorflow/tfjs-node": "^3.11.0", "@vladmandic/face-api": "^1.5.7", "axios": "^0.24.0", - "nodemailer": "^6.7.1", + "nodemailer": "^6.7.2", "tensorset": "^1.2.9" }, "devDependencies": { -<<<<<<< HEAD - "electron": "^16.0.1", -======= "electron": "^16.0.2", ->>>>>>> develop "electron-rebuild": "^3.2.5" } }, @@ -1203,15 +1199,9 @@ "dev": true }, "node_modules/electron": { -<<<<<<< HEAD - "version": "16.0.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-16.0.1.tgz", - "integrity": "sha512-6TSDBcoKGgmKL/+W+LyaXidRVeRl1V4I81ZOWcqsVksdTMfM4AlxTgfaoYdK/nUhqBrUtuPDcqOyJE6Bc4qMpw==", -======= "version": "16.0.2", "resolved": "https://registry.npmjs.org/electron/-/electron-16.0.2.tgz", "integrity": "sha512-kT746yVMztrP4BbT3nrFNcUcfgFu2yelUw6TWBVTy0pju+fBISaqcvoiMrq+8U0vRpoXSu2MJYygOf4T0Det7g==", ->>>>>>> develop "dev": true, "hasInstallScript": true, "dependencies": { @@ -2593,9 +2583,9 @@ } }, "node_modules/nodemailer": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.1.tgz", - "integrity": "sha512-E1C8G3rnXrGjznwGP1k+OrW5k4rl0XtqTEB19f7vtJAMYwfxZVSsAu2iY5xJkrZsbVYr6PwwAwRmFlakPoFC0A==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.2.tgz", + "integrity": "sha512-Dz7zVwlef4k5R71fdmxwR8Q39fiboGbu3xgswkzGwczUfjp873rVxt1O46+Fh0j1ORnAC6L9+heI8uUpO6DT7Q==", "engines": { "node": ">=6.0.0" } @@ -4531,15 +4521,9 @@ "dev": true }, "electron": { -<<<<<<< HEAD - "version": "16.0.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-16.0.1.tgz", - "integrity": "sha512-6TSDBcoKGgmKL/+W+LyaXidRVeRl1V4I81ZOWcqsVksdTMfM4AlxTgfaoYdK/nUhqBrUtuPDcqOyJE6Bc4qMpw==", -======= "version": "16.0.2", "resolved": "https://registry.npmjs.org/electron/-/electron-16.0.2.tgz", "integrity": "sha512-kT746yVMztrP4BbT3nrFNcUcfgFu2yelUw6TWBVTy0pju+fBISaqcvoiMrq+8U0vRpoXSu2MJYygOf4T0Det7g==", ->>>>>>> develop "dev": true, "requires": { "@electron/get": "^1.13.0", @@ -5606,9 +5590,9 @@ "dev": true }, "nodemailer": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.1.tgz", - "integrity": "sha512-E1C8G3rnXrGjznwGP1k+OrW5k4rl0XtqTEB19f7vtJAMYwfxZVSsAu2iY5xJkrZsbVYr6PwwAwRmFlakPoFC0A==" + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.2.tgz", + "integrity": "sha512-Dz7zVwlef4k5R71fdmxwR8Q39fiboGbu3xgswkzGwczUfjp873rVxt1O46+Fh0j1ORnAC6L9+heI8uUpO6DT7Q==" }, "nopt": { "version": "5.0.0", diff --git a/package.json b/package.json index 0163731..17e8bd5 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@tensorflow/tfjs-node": "^3.11.0", "@vladmandic/face-api": "^1.5.7", "axios": "^0.24.0", - "nodemailer": "^6.7.1", + "nodemailer": "^6.7.2", "tensorset": "^1.2.9" } } \ No newline at end of file