Update .gitignore

timkpaine · web-flow · commit 2149e66f133c · 2026-04-19T13:53:09.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -151,10 +151,7 @@ multirun/
 ROADMAP.md
 AGENTS.md
 .github/hooks/sdlc.json
-<<<<<<< before updating
+.superpowers
 
 vcpkg
 vcpkg_installed
-=======
-.superpowers
->>>>>>> after updating
