冲突修改

f855c301 · 赵汉亭 · a8751e5b · f855c301
Commit f855c301 authored Jan 17, 2024 by 赵汉亭
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 35 deletions

.gitignore .gitignore +0 -35

No files found.
--- a/.gitignore
+++ b/.gitignore
-<<<<<<< HEAD
 .DS_Store
-=======
-<<<<<<< Updated upstream
-.DS_Store
-=======
-#.DS_Store
->>>>>>> Stashed changes
->>>>>>> 0a028f6bcbb29205351e9b390599bffc80e9120f
 node_modules/
 dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 **/*.log
-<<<<<<< HEAD
-=======
-<<<<<<< Updated upstream
->>>>>>> 0a028f6bcbb29205351e9b390599bffc80e9120f

 tests/**/coverage/
 tests/e2e/reports
@@ -33,29 +21,6 @@ selenium-debug.log
 .editorconfig
 .eslintignore
 .eslintrc.js
-<<<<<<< HEAD
-# .env.*
-=======
 .env.*
-=======
-#
-#tests/**/coverage/
-#tests/e2e/reports
-#selenium-debug.log
-#
-## Editor directories and files
-.idea
-.vscode
-#*.suo
-#*.ntvs*
-#*.njsproj
-#*.sln
-#*.local
-.editorconfig
-.eslintignore
-.eslintrc.js
-#.env.*
->>>>>>> Stashed changes
->>>>>>> 0a028f6bcbb29205351e9b390599bffc80e9120f
 package-lock.json
 yarn.lock