fix(merge): fixed merge conflicts

Merge64 · Dec 28, 2024 · bcb6e84 · bcb6e84
1 parent 350d646
commit bcb6e84
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-.idea
+.idea
+*.iml