fix: broken gitignore

lwasser · web-flow · commit ee8dffab65b3 · 2025-06-17T18:53:30.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -24,9 +24,6 @@ _output/*
 # pixi environments
 .pixi
 *.egg-info
-<<<<<<< HEAD
 
 # Quarto
 *.quarto_ipynb
-=======
->>>>>>> 726e820 (feat: peer review dashboard part 1)
