Merge pull request #10 from Benjamintf1/dependabot/npm_and_yarn/front…

…end/merge-1.2.1 Bump merge from 1.2.0 to 1.2.1 in /frontend
Benjamintf1 · Dec 11, 2019 · f028454 · f028454
2 parents 573daa6 + 3f0df3a
commit f028454
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -4405,8 +4405,8 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
 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"