diff --git a/package-lock.json b/package-lock.json index 70a407e..6d1cded 100644 --- a/package-lock.json +++ b/package-lock.json @@ -666,9 +666,9 @@ "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "merge": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", - "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz", + "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==" }, "merge-descriptors": { "version": "1.0.1", diff --git a/package.json b/package.json index 87c03c5..9909f08 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "ejs": "2.7.1", "express": "4.17.1", "js-yaml": "3.13.1", - "merge": "1.2.1", + "merge": "2.1.1", "node-uuid": "1.4.8", "pug": "2.0.4", "qr": "0.2.4",