Merge pull request quaertym#105 from quaertym/dependabot/npm_and_yarn…

…/merge-1.2.1 Bump merge from 1.2.0 to 1.2.1
adopted-ember-addons · Feb 6, 2020 · 1dceb64 · 1dceb64
2 parents 28c5a0f + d2f9b2e
commit 1dceb64
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -3606,8 +3606,8 @@ merge-trees@^1.0.1:
     symlink-or-copy "^1.0.0"
 
 merge@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
 
 methods@~1.1.2:
   version "1.1.2"