Resolve merge conflict in .gitignore

eea · Sep 2, 2024 · 83f128b · 83f128b
2 parents bda64e5 + 321f800
commit 83f128b
Show file tree

Hide file tree

Showing 2 changed files with 760 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,5 +10,8 @@ _site/
 venv
 *.pyc
 *.docx
+<<<<<<< HEAD
 #*.html
+=======
+>>>>>>> main
 *_files/