diff --git a/package-lock.json b/package-lock.json index 76c40e5..80fa21a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3529,6 +3529,13 @@ "integrity": "sha512-aLt95pexaugVtQerpmE51+4QfWrNc304uez7jvj6fWnN8GeEHpttB8F36n8N7uVhUMbH/1enbxQ9HImZ4w/9qg==", "requires": { "merge": "^1.1.3" + }, + "dependencies": { + "merge": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", + "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==" + } } }, "execa": { @@ -6493,9 +6500,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 d07143f..327b812 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "hoek": "^4.2.1", "webpack-dev-server": "^3.1.11", "react-dev-utils": "^4.2.2", - "merge": "^1.2.1", + "merge": "^2.1.1", "randomatic": "^3.0.0", "deep-extend": "^0.5.1", "mime": "^1.4.1"