diff --git a/package-lock.json b/package-lock.json index 6085cd7..591a567 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1055,7 +1055,7 @@ "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==", "dev": true, "requires": { - "merge": "1.2.0" + "merge": "1.2.1" } }, "execa": { @@ -2069,9 +2069,9 @@ } }, "merge": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz", - "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", + "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==", "dev": true }, "merge-descriptors": { diff --git a/package.json b/package.json index df92e7e..0eb2787 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "eslint": "^5.16.0", "express": "^4.16.4", "ldapjs": "^1.0.1", + "merge": "1.2.1", "mocha": "^6.0.2", "passport": "^0.4.0", "supertest": "^4.0.2",