From 29364a7b001997e8dd77978d3ae439a4980c650e Mon Sep 17 00:00:00 2001
From: marco76tv <marco.sottana@gmail.com>
Date: Mon, 3 Jun 2024 18:59:49 +0200
Subject: [PATCH] chore(gitignore): remove conflict markers from .gitignore
 file

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 1c09a347..29023fa4 100755
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,7 @@ package-lock.json
 .git-rewrite/
 .php-cs-fixer.cache
 node_modules
+<<<<<<< HEAD
 build
+=======
+>>>>>>> 40bed5b (chore(gitignore): remove conflict markers from .gitignore file)