Update .gitignore

timkpaine · web-flow · commit 95ae86b60072 · 2026-03-22T13:07:41.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -146,12 +146,10 @@ target
 outputs/
 multirun/
 
-<<<<<<< before updating
-vcpkg
-vcpkg_installed
-=======
 # AI
 ROADMAP.md
 AGENTS.md
 .github/hooks/sdlc.json
->>>>>>> after updating
+
+vcpkg
+vcpkg_installed
