From: Tom Hughes <tom@compton.nu>
Date: Mon, 12 Apr 2021 17:34:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3172'
X-Git-Tag: live~2699
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/13499b19f9abee54fc5d3d8d92f206b42b7b2757?hp=24e94464177a5ce61c71dde77603c716d409485e

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

diff --git a/yarn.lock b/yarn.lock
index fa58688d7..efd5a98e7 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.23.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.23.0.tgz#8d029d252f6e8cf45894b4bee08f5493f8e94325"
-  integrity sha512-kqvNVbdkjzpFy0XOszNwjkKzZ+6TcwCQ/h+ozlcIWwaimBBuhlQ4nN6kbiM2L+OjDcznkTJxzYfRFH92sx4a0Q==
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.24.0.tgz#2e44fa62d93892bfdb100521f17345ba54b8513a"
+  integrity sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==
   dependencies:
     "@babel/code-frame" "7.12.11"
     "@eslint/eslintrc" "^0.4.0"