From bae3b0b37733efce3c09787b53e3f99e75df1648 Mon Sep 17 00:00:00 2001
From: Mark Cheret <mark@cheret.de>
Date: Tue, 11 May 2021 20:49:28 +0200
Subject: [PATCH] Close #176

---
 package-lock.json | 27 +++++++++++++++++++++------
 package.json      |  1 +
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4e34d8e..064c80d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,6 +18,7 @@
         "husky": "^4.3.8",
         "lint-staged": "^10.5.4",
         "markdownlint-cli": "^0.27.1",
+        "merge": "^2.1.1",
         "minify": "^7.0.1",
         "node-sass": "^5.0.0",
         "prettier": "^2.2.1",
@@ -3879,6 +3880,12 @@
         "merge": "^1.2.1"
       }
     },
+    "node_modules/find-node-modules/node_modules/merge": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
+      "dev": true
+    },
     "node_modules/find-root": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
@@ -6398,9 +6405,9 @@
       }
     },
     "node_modules/merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
+      "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==",
       "dev": true
     },
     "node_modules/merge-stream": {
@@ -18264,6 +18271,14 @@
       "requires": {
         "findup-sync": "^3.0.0",
         "merge": "^1.2.1"
+      },
+      "dependencies": {
+        "merge": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+          "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
+          "dev": true
+        }
       }
     },
     "find-root": {
@@ -20167,9 +20182,9 @@
       }
     },
     "merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
+      "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==",
       "dev": true
     },
     "merge-stream": {
diff --git a/package.json b/package.json
index bf681ef..1e7e960 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "husky": "^4.3.8",
     "lint-staged": "^10.5.4",
     "markdownlint-cli": "^0.27.1",
+    "merge": "^2.1.1",
     "minify": "^7.0.1",
     "node-sass": "^5.0.0",
     "prettier": "^2.2.1",