fix(FE): resolve merge conflict

This commit is contained in:
randy-ar
2025-11-21 09:45:40 +07:00
35 changed files with 7095 additions and 3466 deletions
-2
View File
@@ -17,7 +17,6 @@
"axios": "^1.12.2",
"clsx": "^2.1.1",
"formik": "^2.4.6",
"inputmask": "^5.0.9",
"moment": "^2.30.1",
"next": "15.5.3",
"react": "19.1.0",
@@ -37,7 +36,6 @@
"@eslint/eslintrc": "^3",
"@iconify/react": "^6.0.2",
"@tailwindcss/postcss": "^4",
"@types/inputmask": "^5.0.7",
"@types/node": "^20",
"@types/react": "^19",
"@types/react-dom": "^19",