merging

2024-03-06 21:49:35 +08:00
parent 11f16b6b06 098ddd3c13
commit 54091bb6b3
14 changed files with 434 additions and 11 deletions
@@ -9,4 +9,8 @@ node_modules/
 .husky
 .prettierignore
 .env.*
-project.*.json
+<<<<<<< HEAD
+project.*.json
+=======
+**/*.svg
+>>>>>>> dev