From f1f394b871195bc4bc50c2c8c8219641c37bb3e5 Mon Sep 17 00:00:00 2001
From: Chris van Marle <qistoph@gmail.com>
Date: Wed, 23 Oct 2019 10:44:30 +0000
Subject: [PATCH] Add merge to package-lock to fix Travis fail

---
 package-lock.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index a57c4b80..bbd94274 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5226,6 +5226,11 @@
         "trim-newlines": "^1.0.0"
       }
     },
+    "merge": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+    },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",