Skip to content

Commit fb4be16

Browse files
committed
sync-427f24d6
1 parent 2c5c878 commit fb4be16

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

yarn.lock

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2467,17 +2467,15 @@ base64-js@^1.3.1:
24672467
resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
24682468
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
24692469

2470-
<<<<<<< HEAD
24712470
baseline-browser-mapping@^2.8.3:
2472-
version "2.9.19"
2473-
resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz#3e508c43c46d961eb4d7d2e5b8d1dd0f9ee4f488"
2474-
integrity sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==
2475-
=======
2471+
version "2.10.0"
2472+
resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.0.tgz#5b09935025bf8a80e29130251e337c6a7fc8cbb9"
2473+
integrity sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==
2474+
24762475
big.js@^5.2.2:
24772476
version "5.2.2"
24782477
resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
24792478
integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
2480-
>>>>>>> 427f24d694674be458f0fe7cb97ab1c8fe736586
24812479

24822480
binary-extensions@^2.0.0:
24832481
version "2.2.0"
@@ -3642,6 +3640,7 @@ eslint-plugin-jsx-a11y@^6.4.1:
36423640

36433641
"eslint-plugin-local-rules@link:eslint-local-rules":
36443642
version "0.0.0"
3643+
uid ""
36453644

36463645
eslint-plugin-react-compiler@^19.0.0-beta-e552027-20250112:
36473646
version "19.0.0-beta-e552027-20250112"

0 commit comments

Comments
 (0)