resolve conflicts

mui · Aug 6, 2024 · 1449d66 · 1449d66
2 parents 8187e6c + af75f50
commit 1449d66
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/apps/pigment-css-vite-app/package.json b/apps/pigment-css-vite-app/package.json
@@ -20,7 +20,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-error-boundary": "^4.0.13",
-    "react-router-dom": "^6.24.1"
+    "react-router-dom": "^6.26.0"
   },
   "devDependencies": {
     "@babel/preset-react": "^7.24.7",

diff --git a/docs/package.json b/docs/package.json
@@ -97,7 +97,7 @@
     "react-intersection-observer": "^9.13.0",
     "react-is": "^18.3.1",
     "react-number-format": "^5.4.0",
-    "react-router-dom": "^6.24.1",
+    "react-router-dom": "^6.26.0",
     "react-runner": "^1.0.5",
     "react-simple-code-editor": "^0.14.1",
     "react-spring": "^9.7.4",

diff --git a/packages/mui-material/package.json b/packages/mui-material/package.json
@@ -71,7 +71,7 @@
     "playwright": "^1.45.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.24.1",
+    "react-router-dom": "^6.26.0",
     "sinon": "^16.1.3"
   },
   "peerDependencies": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/package.json b/test/package.json
@@ -34,7 +34,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-is": "^18.3.1",
-    "react-router-dom": "^6.24.1",
+    "react-router-dom": "^6.26.0",
     "sinon": "^16.1.3",
     "styled-components": "^6.1.12",
     "stylis": "4.2.0",