diff --git a/logkitweb/package.json b/logkitweb/package.json index f073e507c..c05d464ef 100644 --- a/logkitweb/package.json +++ b/logkitweb/package.json @@ -14,7 +14,7 @@ "react-router": "^3.0.2", "react-scripts": "^2.1.5", "lodash": "^4.17.19", - "merge": "^1.2.1" + "merge": "^2.1.1" }, "scripts": { "start": "react-scripts start", diff --git a/logkitweb/yarn.lock b/logkitweb/yarn.lock index 2b6937cc0..40aadd60f 100644 --- a/logkitweb/yarn.lock +++ b/logkitweb/yarn.lock @@ -6580,10 +6580,10 @@ merge@^1.1.3: resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo= -merge@^1.2.1: - version "1.2.1" - resolved "http://registry.npm.taobao.org/merge/download/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" - integrity sha1-OL6/gMMiCopIe2/Ps5QbsRcgwUU= +merge@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98" + integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w== methods@~1.1.2: version "1.1.2"