File tree Expand file tree Collapse file tree 2 files changed +1
-8
lines changed Expand file tree Collapse file tree 2 files changed +1
-8
lines changed Original file line number Diff line number Diff line change 27
27
"react" : " 15.x || 16.x || 17.x"
28
28
},
29
29
"devDependencies" : {
30
- "@sentry-internal/eslint-config-sdk" : " 6.2.4 " ,
30
+ "@sentry-internal/eslint-config-sdk" : " 6.2.3 " ,
31
31
"@testing-library/react" : " ^11.2.6" ,
32
32
"@testing-library/react-hooks" : " ^5.1.1" ,
33
33
"@types/history-4" :
" npm:@types/[email protected] " ,
Original file line number Diff line number Diff line change 2705
2705
dependencies:
2706
2706
highlight.js "^9.15.6"
2707
2707
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
- =======
2714
2708
"@testing-library/dom@^7.22.3", "@testing-library/dom@^7.28.1":
2715
2709
version "7.30.2"
2716
2710
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.30.2.tgz#a63ae7078235ec6248a8a522b04e696ab49896cc"
2717
2711
integrity sha512-NJzHILb5De0J0varzT0W00qDTLcbF86etfAyx5ty7iJhpR6eCs+JR99Ls7AMSUG2bWRYIG0u4KTPH6PMcZhlWQ==
2718
- >>>>>>> Stashed changes
2719
2712
dependencies:
2720
2713
"@babel/code-frame" "^7.10.4"
2721
2714
"@babel/runtime" "^7.12.5"
You can’t perform that action at this time.
0 commit comments