remove merge conflict marker from .gitignore

mlibrary · Nov 25, 2024 · 30c596e · 30c596e
1 parent 6643285
commit 30c596e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,6 @@
 /vendor/
 /convert_report.txt
 .DS_Store
-<<<<<<< HEAD
 /modules/
 Puppetfile.lock
 .tool-versions