diff --git a/package-lock.json b/package-lock.json index fc1bcac..829a8a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4536,6 +4536,14 @@ "dev": true, "requires": { "merge": "^1.2.0" + }, + "dependencies": { + "merge": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", + "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==", + "dev": true + } } }, "execa": { @@ -8760,9 +8768,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 f8c4149..0b61c53 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "bind-decorator": "^1.0.11", "css-loader": "^0.28.11", "lodash": "^4.17.19", - "merge": "^1.2.1", + "merge": "^2.1.1", "moment": "^2.22.1", "prop-types": "^15.6.0", "quill": "^1.3.6",