Merge branch 'main' of https://github.com/coreui/coreui-icons-react into HEAD

mrholek · mrholek · commit a9b2da64f0c7 · 2023-07-11T12:35:21.000+02:00
diff --git a/package.json b/package.json
@@ -37,23 +37,40 @@
     "test:update": "jest --coverage --updateSnapshot"
   },
   "devDependencies": {
+<<<<<<< HEAD
     "@rollup/plugin-commonjs": "^25.0.2",
     "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-typescript": "^11.1.2",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
     "@types/react": "^18.2.14",
     "@types/react-dom": "^18.2.6",
+=======
+    "@rollup/plugin-commonjs": "^25.0.1",
+    "@rollup/plugin-node-resolve": "^15.1.0",
+    "@rollup/plugin-typescript": "^11.1.1",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^14.0.0",
+    "@types/react": "^18.2.11",
+    "@types/react-dom": "^18.2.4",
+>>>>>>> 41c5ac7443275a0274a06661f0569b5026cdf917
     "classnames": "^2.3.2",
     "jest": "^29.6.1",
     "jest-environment-jsdom": "^29.6.1",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+<<<<<<< HEAD
     "rollup": "^3.26.2",
     "rollup-plugin-import-css": "^3.3.1",
     "ts-jest": "^29.1.1",
     "typescript": "^5.1.6"
+=======
+    "rollup": "^3.25.0",
+    "rollup-plugin-import-css": "^3.2.1",
+    "ts-jest": "^29.1.0",
+    "typescript": "^4.9.5"
+>>>>>>> 41c5ac7443275a0274a06661f0569b5026cdf917
   },
   "peerDependencies": {
     "react": ">=17",
