revert version of react and fix merge conflicts

Signed-off-by: aramissennyeydd <aramis.sennyey@doordash.com>
2024-09-24 21:08:37 -04:00
parent 7d9580643a
commit 4958c01d14
53 changed files with 126 additions and 104 deletions
@@ -64,8 +64,8 @@
    "@testing-library/jest-dom": "^6.0.0",
    "@testing-library/react": "^16.0.0",
    "@types/react": "^18.0.0",
-    "react": "^18.0.2",
-    "react-dom": "^18.0.2",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
    "react-router-dom": "^6.3.0"
  },
  "peerDependencies": {