Merge pull request #343 from ianwalter/renovate/ianwalter-merge-7.x

Update dependency @ianwalter/merge to v7
ianwalter · Feb 22, 2020 · 3aafc6f · 3aafc6f
2 parents c9298c1 + 41df9b4
commit 3aafc6f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
   ],
   "dependencies": {
     "@ianwalter/clone": "^5.0.0",
-    "@ianwalter/merge": "^6.0.0"
+    "@ianwalter/merge": "^7.0.0"
   },
   "devDependencies": {
     "@fullhuman/purgecss-loader": "^1.0.0",

diff --git a/yarn.lock b/yarn.lock
@@ -524,6 +524,11 @@
   resolved "https://registry.yarnpkg.com/@ianwalter/merge/-/merge-6.0.0.tgz#7d7facccc86fb407571c78de00a0bd2adca395cb"
   integrity sha512-Ohskh/vqQFgW2Abaxd3kPYz/uNqoUmCSjU8kB8SoRieQqIOyXit1pFKYW4HmcoRcDFbktpWmS1QpIBoF74DGBg==
 
+"@ianwalter/merge@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@ianwalter/merge/-/merge-7.0.0.tgz#2fc97113eea21c1fd25132c8ddb93d3f20a83d04"
+  integrity sha512-PuJJiUQZSNRu6zrC6xrJx9/gX0NX9rilQ646+VBSj+X7RRBUWOogqxEUHojOJcwYTt2JzWVV9DIvvsZMkfZP5Q==
+
 "@ianwalter/npm-short-name@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@ianwalter/npm-short-name/-/npm-short-name-1.0.0.tgz#1ff8fcf73a20841e8fa13af77957a01c6e2329e8"