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

laraxot · Jun 3, 2024 · 745eb10 · 745eb10
1 parent 29364a7
commit 745eb10
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,7 +32,4 @@ package-lock.json
 .git-rewrite/
 .php-cs-fixer.cache
 node_modules
-<<<<<<< HEAD
 build
-=======
->>>>>>> 40bed5b (chore(gitignore): remove conflict markers from .gitignore file)