From 204dced7238c35fcc51218bd840105b722fe285e Mon Sep 17 00:00:00 2001
From: Julia Nguyen <julianguyen@users.noreply.github.com>
Date: Fri, 1 Mar 2019 13:02:24 -0800
Subject: [PATCH] Update to merge v1.2.1 (#1386)

---
 client/package.json | 1 +
 client/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/package.json b/client/package.json
index ca9954b924..413d8bf937 100644
--- a/client/package.json
+++ b/client/package.json
@@ -37,6 +37,7 @@
     "js-cookie": "^2.2.0",
     "jstimezonedetect": "^1.0.6",
     "location-autocomplete": "^1.2.4",
+    "merge": "^1.2.1",
     "pell": "^1.0.6",
     "react": "^16.4.0",
     "react-autocomplete": "^1.8.1",
diff --git a/client/yarn.lock b/client/yarn.lock
index 76f115087d..2a43f2d52a 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -7196,10 +7196,10 @@ merge-stream@^1.0.1:
   dependencies:
     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"
-  integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=
+merge@^1.2.0, merge@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
 
 methods@~1.1.2:
   version "1.1.2"