up

lasorda · Jun 16, 2024 · af20309 · af20309
1 parent a63d2d1
commit af20309
Show file tree

Hide file tree

Showing 4 changed files with 1,110 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 .idea
 .DS_Strore
 pls
+||||||| (empty tree)
+=======
+/target
+>>>>>>> de6f510 (Add cargo generated files)