Merge aa31bb0fc9 into c677dd99d4

Merge pull request #4834 from wispgitgecko9/patch-2
Update macOS.gitignore
2026-08-30 11:47:22 +02:00 · 2026-04-08 21:47:32 +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 · 2025-12-07 11:21:44 +08:00
2 changed files with 2 additions and 0 deletions
--- a/Global/macOS.gitignore
+++ b/Global/macOS.gitignore
@ -1,5 +1,6 @@
 # General
 .DS_Store
 .localized
 __MACOSX/
 .AppleDouble
 .LSOverride
--- a/Julia.gitignore
+++ b/Julia.gitignore
@ -21,6 +21,7 @@ docs/site/
 # It records a fixed state of all packages used by the project. As such, it should not be
 # committed for packages, but should be committed for applications that require a static
 # environment.
 .CondaPkg/
 Manifest*.toml
 # File generated by the Preferences package to store local preferences
Author	SHA1	Message	Date
xgdgsc	ecd3df7a77	Merge `aa31bb0fc9` into `c677dd99d4`	2026-04-08 21:47:32 +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
xgdgsc	aa31bb0fc9	Merge branch 'main' into patch-3	2025-12-07 11:21:44 +08:00
xgdgsc	a16c240cf7	Add .CondaPkg	2024-08-14 16:19:40 +08:00