misc: Update @sentry/react dependencies to fix types issue vol. 2

getsentry · Mar 30, 2021 · 007e62f · 007e62f
1 parent 3556d73
commit 007e62f
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -27,19 +27,11 @@
     "react": "15.x || 16.x || 17.x"
   },
   "devDependencies": {
-<<<<<<< Updated upstream
-    "@sentry-internal/eslint-config-sdk": "6.2.3",
-    "@testing-library/react": "^10.4.9",
-    "@testing-library/react-hooks": "^3.3.0",
-    "@types/history-4": "npm:@types/history@4.7.7",
-    "@types/history-5": "npm:@types/history@4.7.7",
-=======
     "@sentry-internal/eslint-config-sdk": "6.2.4",
     "@testing-library/react": "^11.2.6",
     "@testing-library/react-hooks": "^5.1.1",
     "@types/history-4": "npm:@types/history@4.7.8",
     "@types/history-5": "npm:@types/history@4.7.8",
->>>>>>> Stashed changes
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/react": "^17.0.3",
     "@types/react-router-3": "npm:@types/react-router@3.0.24",