Merge a85a4c2ffd 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:01:21 +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-21 14:43:36 +01:00
2 changed files with 5 additions and 4 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
@ -195,10 +195,10 @@ cython_debug/
 .abstra/
 # Visual Studio Code
-#   Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore 
+#   Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore that
-#   that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
+#   can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
-#   and can be added to the global gitignore or merged into this file. However, if you prefer, 
+#   and can be added to the global gitignore or merged into this file. However, if you prefer, you
-#   you could uncomment the following to ignore the entire vscode folder
+#   could uncomment the following to ignore the entire vscode folder
 # .vscode/
 # Ruff stuff:
Author	SHA1	Message	Date
Rubén Pérez Alonso	aaeadcb604	Merge `a85a4c2ffd` into `c677dd99d4`	2026-04-08 13:01:21 +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
Rubén Pérez Alonso	a85a4c2ffd	Remove trailing spaces and rewrap to 100 columns Removed 2 trailing spaces and rewrapped the surrounding paragraph to 100 columns, consistent with the rest of the file.	2026-01-21 14:43:36 +01:00