Merge pull request #355 from Human-Connection/dependabot/npm_and_yarn…

…/merge-1.2.1 [Security] Bump merge from 1.2.0 to 1.2.1
Human-Connection · Feb 12, 2019 · d4917da · d4917da
2 parents 28c57ea + f03711e
commit d4917da
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -8012,8 +8012,8 @@ merge-stream@^1.0.1:
     readable-stream "^2.0.1"
 
 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"