diff --git a/package-lock.json b/package-lock.json index 194e4f9..7252ddd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6309,9 +6309,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==", "dev": true }, "merge-deep": { diff --git a/package.json b/package.json index acdfec5..357cb17 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "jest-cli": "^25.4.0", "jest-image-snapshot": "^3.1.0", "jest-puppeteer": "^4.4.0", - "merge": "^1.2.1", + "merge": "^2.1.1", "puppeteer": "^3.0.1", "style-loader": "^1.2.1", "ts-jest": "^25.4.0",