Merge remote-tracking branch 'origin/master'

# Conflicts: # pom.xml
Fi0x · Nov 29, 2022 · 6bcb6bf · 6bcb6bf
2 parents 8200cb6 + 0f1445a
commit 6bcb6bf
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/.idea/