chore(gitignore): remove conflict markers from .gitignore file

laraxot · Jun 3, 2024 · 29364a7 · 29364a7
1 parent b391f1f
commit 29364a7
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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)