merge main

matthewnbrown · Mar 22, 2023 · b35e0f1 · b35e0f1
1 parent 2b23f35
commit b35e0f1
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 155 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,6 +38,7 @@ captures/
 
 # IntelliJ
 *.iml*
+.idea
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml