Skip to content

Commit 6e6786f

Browse files
committed
misc: Refresh yarn.lock to lock deps for CI
1 parent 007e62f commit 6e6786f

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

packages/react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"react": "15.x || 16.x || 17.x"
2828
},
2929
"devDependencies": {
30-
"@sentry-internal/eslint-config-sdk": "6.2.4",
30+
"@sentry-internal/eslint-config-sdk": "6.2.3",
3131
"@testing-library/react": "^11.2.6",
3232
"@testing-library/react-hooks": "^5.1.1",
3333
"@types/history-4": "npm:@types/[email protected]",

yarn.lock

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2705,17 +2705,10 @@
27052705
dependencies:
27062706
highlight.js "^9.15.6"
27072707

2708-
<<<<<<< Updated upstream
2709-
"@testing-library/dom@^7.22.3":
2710-
version "7.30.1"
2711-
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.30.1.tgz#07b6f3ccd7f1f1e34ab0406932073e2971817f3d"
2712-
integrity sha512-RQUvqqq2lxTCOffhSNxpX/9fCoR+nwuQPmG5uhuuEH5KBAzNf2bK3OzBoWjm5zKM78SLjnGRAKt8hRjQA4E46A==
2713-
=======
27142708
"@testing-library/dom@^7.22.3", "@testing-library/dom@^7.28.1":
27152709
version "7.30.2"
27162710
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.30.2.tgz#a63ae7078235ec6248a8a522b04e696ab49896cc"
27172711
integrity sha512-NJzHILb5De0J0varzT0W00qDTLcbF86etfAyx5ty7iJhpR6eCs+JR99Ls7AMSUG2bWRYIG0u4KTPH6PMcZhlWQ==
2718-
>>>>>>> Stashed changes
27192712
dependencies:
27202713
"@babel/code-frame" "^7.10.4"
27212714
"@babel/runtime" "^7.12.5"

0 commit comments

Comments
 (0)