Fix/conflicts (#215)

Author: deleonio

dev/docs/30-components/combobox.mdx

@@ -0,0 +1,12 @@
+---
+title: Combobox
+description: Beschreibung und Spezifikation für die Combobox-Komponente.
+tags:
+  - Combobox
+  - Beschreibung
+  - Spezifikation
+---
+
+import Readme from '../../readmes/combobox/readme.md';
+
+<Readme />

dev/docs/30-components/icon-font-awesome.md

@@ -0,0 +1,12 @@
+---
+title: Toolbar
+description: Beschreibung und Spezifikation für die Toolbar-Komponente.
+tags:
+  - Toolbar
+  - Beschreibung
+  - Spezifikation
+---
+
+import Readme from '../../readmes/toolbar/readme.md';
+
+<Readme />

dev/docs/30-components/icon-icofont.md

@@ -30,21 +30,21 @@
 		"regenerate:version": "rimraf i18n/en/docusaurus-plugin-content-docs/version-2.0 versioned_docs/version-2.0 versioned_readmes/2.0 versioned_sidebars/version-2.0-sidebars.json && npm run docusaurus docs:version 2.0"
 	},
 	"dependencies": {
-		"@docusaurus/core": "3.3.2",
-		"@docusaurus/eslint-plugin": "3.3.2",
-		"@docusaurus/plugin-client-redirects": "3.3.2",
-		"@docusaurus/plugin-ideal-image": "3.3.2",
-		"@docusaurus/plugin-pwa": "3.3.2",
-		"@docusaurus/preset-classic": "3.3.2",
-		"@docusaurus/theme-mermaid": "3.3.2",
-		"@docusaurus/theme-translations": "3.3.2",
-		"@leanup/form": "1.3.50",
+		"@docusaurus/core": "3.4.0",
+		"@docusaurus/eslint-plugin": "3.4.0",
+		"@docusaurus/plugin-client-redirects": "3.4.0",
+		"@docusaurus/plugin-ideal-image": "3.4.0",
+		"@docusaurus/plugin-pwa": "3.4.0",
+		"@docusaurus/preset-classic": "3.4.0",
+		"@docusaurus/theme-mermaid": "3.4.0",
+		"@docusaurus/theme-translations": "3.4.0",
+		"@leanup/form": "1.3.53",
 		"@mdx-js/react": "3.0.1",
 		"@monaco-editor/react": "4.6.0",
-		"@public-ui/components": "2.1.1",
-		"@public-ui/react": "2.1.1",
+		"@public-ui/components": "2.1.2",
+		"@public-ui/react": "2.1.2",
 		"@public-ui/schema": "2.0.15",
-		"@public-ui/themes": "2.1.1",
+		"@public-ui/themes": "2.1.2",
 		"classnames": "2.5.1",
 		"docusaurus-lunr-search": "3.4.0",
 		"mermaid": "10.9.1",
@@ -55,29 +55,29 @@
 	},
 	"devDependencies": {
 		"@docsearch/react": "3.6.0",
-		"@docusaurus/module-type-aliases": "3.3.2",
-		"@docusaurus/types": "3.3.2",
+		"@docusaurus/module-type-aliases": "3.4.0",
+		"@docusaurus/types": "3.4.0",
 		"@tsconfig/docusaurus": "2.0.3",
-		"@types/node": "20.12.12",
+		"@types/node": "20.14.2",
 		"@types/prettier": "2.7.3",
-		"@typescript-eslint/eslint-plugin": "7.10.0",
-		"@typescript-eslint/parser": "7.10.0",
+		"@typescript-eslint/eslint-plugin": "7.13.0",
+		"@typescript-eslint/parser": "7.13.0",
 		"autoprefixer": "10.4.19",
 		"cpy-cli": "5.0.0",
 		"depcheck": "1.4.7",
 		"docusaurus-plugin-sass": "0.2.5",
 		"eslint": "8.57.0",
 		"eslint-plugin-jsx-a11y": "6.8.0",
 		"eslint-plugin-mdx": "3.1.5",
-		"eslint-plugin-react": "7.34.1",
+		"eslint-plugin-react": "7.34.2",
 		"html-minifier-terser": "7.2.0",
 		"npm-check-updates": "16.14.20",
 		"npm-run-all": "4.1.5",
 		"postcss": "8.4.38",
 		"prop-types": "15.8.1",
 		"rimraf": "3.0.2",
-		"sass": "1.77.2",
-		"tailwindcss": "3.4.3",
+		"sass": "1.77.4",
+		"tailwindcss": "3.4.4",
 		"ts-prune": "0.10.3",
 		"typescript": "5.4.5"
 	},