From 32d8029780b23b176433d149a10e47e42f00274b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Insaurralde=20Avalos?=
 <adrianinsaval@gmail.com>
Date: Wed, 14 Jun 2023 22:12:41 -0400
Subject: [PATCH] Update .gitignore files (vscode + conda integration)
 [skip-ci]

---
 .gitignore         | 1 +
 .vscode/.gitignore | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 .vscode/.gitignore

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