From 351995be80048eba747e6b5e3a5638e2fd162d91 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Mon, 22 Jul 2019 19:27:35 +0200
Subject: [PATCH] fix package-lock

---
 package-lock.json | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e2256fae096..23986a861c3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -327,7 +327,6 @@
       "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
       "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="
     },
-<<<<<<< HEAD
     "@types/duplexify": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.6.0.tgz",
@@ -335,13 +334,6 @@
       "requires": {
         "@types/node": "*"
       }
-=======
-    "@types/events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
-      "dev": true
->>>>>>> 9727cbfe3... use mandrill for password resets
     },
     "@types/form-data": {
       "version": "2.2.1",
@@ -17584,6 +17576,11 @@
         }
       }
     },
+    "nodemailer": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.0.0.tgz",
+      "integrity": "sha512-PMQJyLhoNAMoBU1hEh5aaUkpa/tcDNwzS7s7zow/myKfoEoZewMxUuWZqQ5yjYsAnvE484KSkYH5s6iPvcjhCg=="
+    },
     "nodemon": {
       "version": "1.18.10",
       "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.18.10.tgz",