Merge pull request #43 from jofftiquez/dependabot/npm_and_yarn/merge-…

…2.1.1

chore(deps): bump merge from 1.2.1 to 2.1.1

package.json

@@ -35,7 +35,7 @@
     "js-yaml": "^3.13.1",
     "lodash": "^4.17.14",
     "mem": "^5.1.1",
-    "merge": "^1.2.1",
+    "merge": "^2.1.1",
     "randomatic": "^3.1.1",
     "sshpk": "^1.16.1",
     "stringstream": "^1.0.0",

yarn.lock

@@ -4814,10 +4814,10 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-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==
 
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"