Skip to content

Commit 4b5169c

Browse files
fix conflict (#67255)
Co-authored-by: Michael Myers <michael.myers@goteleport.com>
1 parent 49f98b2 commit 4b5169c

2 files changed

Lines changed: 79 additions & 117 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@types/wicg-file-system-access": "^2023.10.7",
4848
"@typescript/native-preview": "7.0.0-dev.20260527.1",
4949
"cspell": "^10.0.0",
50-
"eslint": "^9.39.2",
50+
"eslint": "^10.4.1",
5151
"eslint-plugin-jest-dom": "^5.5.0",
5252
"eslint-plugin-storybook": "^10.4.1",
5353
"eslint-plugin-testing-library": "7.16.2",

pnpm-lock.yaml

Lines changed: 78 additions & 116 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)