merge conflicts fixes

mnajdova · Oct 9, 2023 · c97cc3a · c97cc3a
1 parent 91c561e
commit c97cc3a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -107,7 +107,7 @@
     "react-window": "^1.8.9",
     "recharts": "2.8.0",
     "rimraf": "^5.0.5",
-    "styled-components": "^5.3.11",
+    "styled-components": "^6.0.0",
     "stylis": "4.2.0",
     "stylis-plugin-rtl": "^2.1.1",
     "use-count-up": "^3.0.1",

diff --git a/packages/mui-system/package.json b/packages/mui-system/package.json
@@ -60,7 +60,6 @@
     "@types/prop-types": "^15.7.7",
     "@types/react": "^18.2.23",
     "@types/sinon": "^10.0.19",
-    "@types/styled-components": "^5.1.28",
     "chai": "^4.3.10",
     "fast-glob": "^3.3.1",
     "lodash": "^4.17.21",