diff --git a/package-lock.json b/package-lock.json index b7bc3f7..da056c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5422,9 +5422,9 @@ } }, "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 355d1df..8dd463a 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "dotenv": "^7.0.0", "express": "^4.16.4", "http": "0.0.0", - "merge": "^1.2.1", + "merge": "^2.1.1", "pg": "^7.3.0", "reflect-metadata": "^0.1.10", "request": "^2.88.0",