misc: Refresh yarn.lock to lock deps for CI

getsentry · Mar 30, 2021 · 6e6786f · 6e6786f
1 parent 007e62f
commit 6e6786f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -27,7 +27,7 @@
     "react": "15.x || 16.x || 17.x"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "6.2.4",
+    "@sentry-internal/eslint-config-sdk": "6.2.3",
     "@testing-library/react": "^11.2.6",
     "@testing-library/react-hooks": "^5.1.1",
     "@types/history-4": "npm:@types/[email protected]",

diff --git a/yarn.lock b/yarn.lock
@@ -2705,17 +2705,10 @@
   dependencies:
     highlight.js "^9.15.6"
 
-<<<<<<< Updated upstream
-"@testing-library/dom@^7.22.3":
-  version "7.30.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.30.1.tgz#07b6f3ccd7f1f1e34ab0406932073e2971817f3d"
-  integrity sha512-RQUvqqq2lxTCOffhSNxpX/9fCoR+nwuQPmG5uhuuEH5KBAzNf2bK3OzBoWjm5zKM78SLjnGRAKt8hRjQA4E46A==
-=======
 "@testing-library/dom@^7.22.3", "@testing-library/dom@^7.28.1":
   version "7.30.2"
   resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.30.2.tgz#a63ae7078235ec6248a8a522b04e696ab49896cc"
   integrity sha512-NJzHILb5De0J0varzT0W00qDTLcbF86etfAyx5ty7iJhpR6eCs+JR99Ls7AMSUG2bWRYIG0u4KTPH6PMcZhlWQ==
->>>>>>> Stashed changes
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/runtime" "^7.12.5"