From: Tom Hughes <tom@compton.nu>
Date: Mon, 26 Apr 2021 13:11:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3183'
X-Git-Tag: live~2672
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fe50bcd4d75f43fa0fe5bc400c9068a52428b4ab?hp=70d7d8d850148f714b70a3297c02a8203214dec6

Merge remote-tracking branch 'upstream/pull/3183'
---

diff --git a/yarn.lock b/yarn.lock
index efd5a98e7..299fec4d7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -255,9 +255,9 @@ eslint-visitor-keys@^2.0.0:
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
 eslint@^7.3.1:
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.24.0.tgz#2e44fa62d93892bfdb100521f17345ba54b8513a"
-  integrity sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67"
+  integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==
   dependencies:
     "@babel/code-frame" "7.12.11"
     "@eslint/eslintrc" "^0.4.0"