fix merge bug

This commit is contained in:
sijinhui
2024-07-16 18:42:04 +08:00
parent 946c3b67f6
commit e94e2b7c96
12 changed files with 158 additions and 97 deletions

View File

@@ -75,8 +75,8 @@
"autoprefixer": "^10.4.17",
"cross-env": "^7.0.3",
"date-fns": "^3.6.0",
"eslint": "9.6.0",
"eslint-config-next": "^14.2.3",
"eslint": "8.57.0",
"eslint-config-next": "14.2.5",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"husky": "^9.0.7",
@@ -95,6 +95,5 @@
"resolutions": {
"lint-staged/yaml": "^2.2.2"
},
"type": "module",
"packageManager": "yarn@1.22.19"
}