chore: merge conflicts

This commit is contained in:
N3WT DE COMPET
2025-02-23 19:08:13 +01:00
parent 1911f79f45
commit 445cf35382
11 changed files with 187 additions and 166 deletions

View File

@ -8,6 +8,7 @@
"name": "n3wt-school-front-end",
"version": "0.0.1",
"dependencies": {
"@docuseal/react": "^1.0.56",
"@radix-ui/react-dialog": "^1.1.2",
"@tailwindcss/forms": "^0.5.9",
"date-fns": "^4.1.0",
@ -201,6 +202,12 @@
"kuler": "^2.0.0"
}
},
"node_modules/@docuseal/react": {
"version": "1.0.56",
"resolved": "https://registry.npmjs.org/@docuseal/react/-/react-1.0.56.tgz",
"integrity": "sha512-xna62Op4WLIVmgz2U0mi4paFayslxBUk2P8u3D70e1JgVRXsPFwzH6b1WhotedN9PMPS+cG2HP1PmpYoEzdZTQ==",
"license": "MIT"
},
"node_modules/@eslint-community/eslint-utils": {
"version": "4.4.0",
"dev": true,