Merge branch 'staging' into publish_staging_without_passing_tests

TouK · Jan 17, 2025 · d9eff23 · d9eff23
2 parents 8e9bb1f + 4026065
commit d9eff23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
-.idea/
+.idea/*
+!.idea/icon.svg
 target/
 *.iml
 .*orig

diff --git a/.idea/icon.svg b/.idea/icon.svg
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
-    .idea/
+    .idea/*
+    !.idea/icon.svg
     target/
     *.iml
     .*orig
@@ Expand Down @@