Merge f15e67fefa into c677dd99d4

Merge pull request #4834 from wispgitgecko9/patch-2
Update macOS.gitignore
2026-08-30 03:37:05 +02:00 · 2026-04-08 13:15:58 +00:00 · 2026-04-07 20:04:22 -07:00 · 2026-04-07 20:02:07 -07:00 · 2026-04-03 21:59:36 -05:00 · 2026-01-12 21:05:04 +05:30
2 changed files with 5 additions and 0 deletions
--- a/Global/macOS.gitignore
+++ b/Global/macOS.gitignore
@ -1,5 +1,6 @@
 # General
 .DS_Store
+.localized
 __MACOSX/
 .AppleDouble
 .LSOverride
--- a/Python.gitignore
+++ b/Python.gitignore
@ -157,6 +157,10 @@ ENV/
 env.bak/
 venv.bak/

+# Conda environments
+conda-meta/
+
+
 # Spyder project settings
 .spyderproject
 .spyproject
Author	SHA1	Message	Date
Alex Rohith I	4333402829	Merge `f15e67fefa` into `c677dd99d4`	2026-04-08 13:15:58 +00:00
Devin Dooley	c677dd99d4	Merge pull request #4834 from wispgitgecko9/patch-2 Update macOS.gitignore	2026-04-07 20:04:22 -07:00
Devin Dooley	a78658650d	Revert change to Icon rule	2026-04-07 20:02:07 -07:00
WiSP	6a7b122e75	Update macOS.gitignore Added .localized file to the gitignore.	2026-04-03 21:59:36 -05:00
Alexrohith	f15e67fefa	Improve comments for Python .gitignore	2026-01-12 21:05:04 +05:30