Update .gitignore

timkpaine · web-flow · commit e3e076797373 · 2026-02-22T08:12:15.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -156,11 +156,9 @@ hatch_cpp/labextension
 # Rust
 target
 
-<<<<<<< before updating
-vcpkg
-vcpkg_installed
-=======
 # Hydra
 outputs/
 multirun/
->>>>>>> after updating
+
+vcpkg
+vcpkg_installed
