fix: Solved merge conflicts

2024-01-25 12:39:52 +01:00
parent 7dca13f9e0
commit f4f56ad42d
1 changed files with 12 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,13 @@
+### Rust ###
+# Generated by Cargo
+# will have compiled files and executables
+debug/
+target/
+
+# Substreams spkg files are build artifacts
+*.spkg
+
+.env
+.vscode
 .idea
-.vscode/
+*.log