From 7eed584c0197d0b5a93f58f8b645c0b84588d8e1 Mon Sep 17 00:00:00 2001
From: David Mehren
Date: Wed, 10 Oct 2018 22:01:32 +0200
Subject: Update yarn.lock

Signed-off-by: David Mehren <dmehren1@gmail.com>
---
 yarn.lock | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/yarn.lock b/yarn.lock
index ef1be26e..838f53fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11168,6 +11168,13 @@ webpack-cli@^3.1.0:
     v8-compile-cache "^2.0.0"
     yargs "^12.0.1"
 
+webpack-merge@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
+  integrity sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==
+  dependencies:
+    lodash "^4.17.5"
+
 webpack-parallel-uglify-plugin@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/webpack-parallel-uglify-plugin/-/webpack-parallel-uglify-plugin-1.1.0.tgz#252a6c796bf79a8047b00de2cf08c23aa9861441"
-- 
cgit v1.2.3