merge dev, conflicts solved

trydirect · Nov 22, 2023 · 380fa71 · 380fa71
2 parents a112133 + 3a9fa05
commit 380fa71
Show file tree

Hide file tree

Showing 36 changed files with 2,304 additions and 287 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 target
 .idea
+files
diff --git a/.idea/stacker.iml b/.idea/stacker.iml
-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
     target
     .idea
+    files