fix: 合并github分支问题修复

Former-commit-id: 27699dcc21018068659432531e9992c9a4e18271
2023-08-07 23:58:21 +08:00
parent 6168a2450b 3e8df9a431
commit d5669d18f6
6 changed files with 28 additions and 6 deletions
--- a/.prettierrc.cjs
+++ b/.prettierrc.cjs
@@ -33,4 +33,6 @@ module.exports = {
  useTabs: false,
  // vue 文件中是否缩进 <style> 和 <script> 标签，默认 false
  vueIndentScriptAndStyle: false,
+
+  endOfLine: "auto",
 };