Merge branch 'main' into milestone/Structure

Kasean · Dec 21, 2023 · 0fc3d3f · 0fc3d3f
2 parents a7d1794 + 88f06bb
commit 0fc3d3f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 .gradle
-.idea
 build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
@@ -9,9 +8,10 @@ build/
 *.iws
 *.iml
 *.ipr
-out/
 !**/src/main/**/out/
 !**/src/test/**/out/
+.idea/
+out/
 
 ### Eclipse ###
 .apt_generated
@@ -38,3 +38,4 @@ bin/
 ### Mac OS ###
 .DS_Store
 /.idea/
+/.idea/