Revert "up"

This reverts commit af20309.
lasorda · Jun 17, 2024 · 5787904 · 5787904
1 parent af20309
commit 5787904
Show file tree

Hide file tree

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