fix: resolve merge conflict in globals.css

This commit is contained in:
VuHoangThien
2026-04-14 23:43:14 +07:00
parent 13a281b8c8
commit a7356cdb7a
29 changed files with 23 additions and 9797 deletions

View File

@@ -13,18 +13,19 @@
"dependencies": {
"axios": "^1.13.4",
"next": "16.1.6",
"postcss": "^8.5.9",
"react": "19.2.3",
"react-dom": "19.2.3"
},
"devDependencies": {
"@tailwindcss/postcss": "^4",
"@tailwindcss/postcss": "^4.2.2",
"@types/node": "^20",
"@types/react": "^19",
"@types/react-dom": "^19",
"eslint": "^9",
"eslint-config-next": "16.1.6",
"sass": "^1.98.0",
"tailwindcss": "^4",
"tailwindcss": "^4.2.2",
"typescript": "^5"
}
}