|
89 | 89 | minimatch "^3.1.2" |
90 | 90 | strip-json-comments "^3.1.1" |
91 | 91 |
|
| 92 | +<<<<<<< HEAD |
92 | 93 | |
93 | 94 | version "9.25.1" |
94 | 95 | resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.25.1.tgz#25f5c930c2b68b5ebe7ac857f754cbd61ef6d117" |
95 | 96 | integrity sha512-dEIwmjntEx8u3Uvv+kr3PDeeArL8Hw07H9kyYxCjnM9pBjfEhk6uLXSchxxzgiwtRhhzVzqmUSDFBOi1TuZ7qg== |
| 97 | +======= |
| 98 | + |
| 99 | + version "9.25.0" |
| 100 | + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.25.0.tgz#4656b39de7cbf12fd66e7d54d9a26d05855b2a5a" |
| 101 | + integrity sha512-iWhsUS8Wgxz9AXNfvfOPFSW4VfMXdVhp1hjkZVhXCrpgh/aLcc45rX6MPu+tIVUWDw0HfNwth7O28M1xDxNf9w== |
| 102 | +>>>>>>> 9d6b8a6 (Update dependency eslint to v9.25.0 (#425) (#426)) |
96 | 103 |
|
97 | 104 | "@eslint/object-schema@^2.1.6": |
98 | 105 | version "2.1.6" |
@@ -1451,18 +1458,29 @@ eslint-visitor-keys@^4.2.0: |
1451 | 1458 | resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45" |
1452 | 1459 | integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw== |
1453 | 1460 |
|
| 1461 | +<<<<<<< HEAD |
1454 | 1462 | |
1455 | 1463 | version "9.25.1" |
1456 | 1464 | resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.25.1.tgz#8a7cf8dd0e6acb858f86029720adb1785ee57580" |
1457 | 1465 | integrity sha512-E6Mtz9oGQWDCpV12319d59n4tx9zOTXSTmc8BLVxBx+G/0RdM5MvEEJLU9c0+aleoePYYgVTOsRblx433qmhWQ== |
| 1466 | +======= |
| 1467 | + |
| 1468 | + version "9.25.0" |
| 1469 | + resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.25.0.tgz#ebf629bb26d8e7490ff94f87321863cd73272351" |
| 1470 | + integrity sha512-MsBdObhM4cEwkzCiraDv7A6txFXEqtNXOb877TsSp2FCkBNl8JfVQrmiuDqC1IkejT6JLPzYBXx/xAiYhyzgGA== |
| 1471 | +>>>>>>> 9d6b8a6 (Update dependency eslint to v9.25.0 (#425) (#426)) |
1458 | 1472 | dependencies: |
1459 | 1473 | "@eslint-community/eslint-utils" "^4.2.0" |
1460 | 1474 | "@eslint-community/regexpp" "^4.12.1" |
1461 | 1475 | "@eslint/config-array" "^0.20.0" |
1462 | 1476 | "@eslint/config-helpers" "^0.2.1" |
1463 | 1477 | "@eslint/core" "^0.13.0" |
1464 | 1478 | "@eslint/eslintrc" "^3.3.1" |
| 1479 | +<<<<<<< HEAD |
1465 | 1480 | "@eslint/js" "9.25.1" |
| 1481 | +======= |
| 1482 | + "@eslint/js" "9.25.0" |
| 1483 | +>>>>>>> 9d6b8a6 (Update dependency eslint to v9.25.0 (#425) (#426)) |
1466 | 1484 | "@eslint/plugin-kit" "^0.2.8" |
1467 | 1485 | "@humanfs/node" "^0.16.6" |
1468 | 1486 | "@humanwhocodes/module-importer" "^1.0.1" |
|
0 commit comments