Merge 399559e0b7 into c677dd99d4

Merge pull request #4834 from wispgitgecko9/patch-2
Update macOS.gitignore
2026-08-30 11:47:22 +02:00 · 2026-04-08 12:57:30 +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-25 15:33:17 -06:00
2 changed files with 3 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
@ -200,6 +200,8 @@ cython_debug/
 #   and can be added to the global gitignore or merged into this file. However, if you prefer, 
 #   you could uncomment the following to ignore the entire vscode folder
 # .vscode/
 # Temporary file for partial code execution
 tempCodeRunnerFile.py
 # Ruff stuff:
 .ruff_cache/
Author	SHA1	Message	Date
kailando	f99742578f	Merge `399559e0b7` into `c677dd99d4`	2026-04-08 12:57:30 +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
kailando	399559e0b7	Resolve merge conflicts for PR #4300	2026-01-25 15:33:17 -06:00