fix(FE-33): fix conflict git

2026-05-20 05:22:02 +00:00 · 2025-10-09 13:35:30 +07:00
parent a83452a0e4 94a5ce5604
commit 5cf98ed95e
59 changed files with 4048 additions and 327 deletions
@@ -41,4 +41,7 @@ yarn-error.log*
 next-env.d.ts

 # prettier
-.prettierrc
+.prettierrc
+
+# idea
+.idea