From: Tom Hughes <tom@compton.nu>
Date: Sat, 19 Jun 2021 13:45:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3227'
X-Git-Tag: live~2811
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/11cf957460523b97aaa1ec110f4901fbce099321?hp=4a45092e27607f37843edbabbeda67919049e11b

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

diff --git a/yarn.lock b/yarn.lock
index 666763944..ac540af9f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -270,9 +270,9 @@ eslint-visitor-keys@^2.0.0:
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
 eslint@^7.3.1:
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820"
-  integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0"
+  integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==
   dependencies:
     "@babel/code-frame" "7.12.11"
     "@eslint/eslintrc" "^0.4.2"