diff --git a/.gitignore b/.gitignore
index 5250cd0cbe..583f09351a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ install_manifest.txt
 /cmake-build*/
 /src/Tools/offlinedoc/localwiki/
 /src/Tools/offlinedoc/*.txt
+/conda/environment.yml
 OpenSCAD_rc.py
 tags
 
diff --git a/.vscode/.gitignore b/.vscode/.gitignore
deleted file mode 100644
index 19b0cd20da..0000000000
--- a/.vscode/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-environment.yml