diff --git a/package.json b/package.json index c223fc4..26ca11c 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "identicon.js": "^2.3.2", "js-sha256": "^0.9.0", "macaddress": "^0.2.9", - "merge": "^1.2.1", + "merge": "^2.1.1", "moment": "^2.22.2", "node-sass": "^4.9.1", "object-assign": "4.1.1", diff --git a/yarn.lock b/yarn.lock index 7389c0d..0837d1b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5590,10 +5590,10 @@ merge2@^1.2.3: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -merge@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" - integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== +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"