From f4f56ad42dbf5ab0a5eb6eb2e55eaf4c4794d269 Mon Sep 17 00:00:00 2001
From: domenicodev <domenico.romeo3919@gmail.com>
Date: Thu, 25 Jan 2024 12:39:52 +0100
Subject: [PATCH] fix: Solved merge conflicts

---
 .gitignore | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 4045fd6..2c65d74 100644
--- 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