summaryrefslogtreecommitdiff
path: root/yarn.lock
diff options
context:
space:
mode:
authorDavid Mehren2021-02-12 22:53:05 +0100
committerGitHub2021-02-12 22:53:05 +0100
commitfbac2d7ef8be325635da78e0b762cfb813c1fca2 (patch)
treee8440c525d2caf6f42cf33e3e5581c86526928b9 /yarn.lock
parent6cbf233fe76698462121f2f17c9231421b9673dc (diff)
parent87909b599e08a2361173c3a8717927da51e1aec3 (diff)
Merge pull request #895 from hedgedoc/renovate/master-webpack-merge-5.x
Diffstat (limited to 'yarn.lock')
-rw-r--r--yarn.lock9
1 files changed, 1 insertions, 8 deletions
diff --git a/yarn.lock b/yarn.lock
index b42b8e3b..a9b337ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11506,14 +11506,7 @@ webpack-cli@4.5.0:
v8-compile-cache "^2.2.0"
webpack-merge "^5.7.3"
-webpack-merge@4.2.2:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
- integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
- dependencies:
- lodash "^4.17.15"
-
-webpack-merge@^5.7.3:
+webpack-merge@5.7.3, webpack-merge@^5.7.3:
version "5.7.3"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213"
integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==