From: Tom Hughes <tom@compton.nu>
Date: Mon, 29 Mar 2021 11:48:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3155'
X-Git-Tag: live~1743
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/640fee0bf87f7922c6180b4edd2d2402e60270c7?hp=8f31b15237a97c63eb0ab795d9c6684e1362c2fd

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

diff --git a/yarn.lock b/yarn.lock
index 9103390dd..fa58688d7 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.22.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.22.0.tgz#07ecc61052fec63661a2cab6bd507127c07adc6f"
-  integrity sha512-3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg==
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.23.0.tgz#8d029d252f6e8cf45894b4bee08f5493f8e94325"
+  integrity sha512-kqvNVbdkjzpFy0XOszNwjkKzZ+6TcwCQ/h+ozlcIWwaimBBuhlQ4nN6kbiM2L+OjDcznkTJxzYfRFH92sx4a0Q==
   dependencies:
     "@babel/code-frame" "7.12.11"
     "@eslint/eslintrc" "^0.4.0"