Merge 11738d1b8a into c677dd99d4

Merge pull request #4834 from wispgitgecko9/patch-2
Update macOS.gitignore
2026-08-30 11:47:22 +02:00 · 2026-04-08 10:52:12 +07: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-09-21 23:53:14 -07:00
2 changed files with 3 additions and 1 deletions
--- a/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@ -63,7 +63,8 @@ atlassian-ide-plugin.xml
 # SonarLint plugin
 .idea/sonarlint/
-.idea/sonarlint.xml # see https://community.sonarsource.com/t/is-the-file-idea-idea-idea-sonarlint-xml-intended-to-be-under-source-control/121119
+# See https://community.sonarsource.com/t/is-the-file-idea-idea-idea-sonarlint-xml-intended-to-be-under-source-control/121119
 .idea/sonarlint.xml
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
--- a/Global/macOS.gitignore
+++ b/Global/macOS.gitignore
@ -1,5 +1,6 @@
 # General
 .DS_Store
 .localized
 __MACOSX/
 .AppleDouble
 .LSOverride
Author	SHA1	Message	Date
Huy Z	b79d61aeaf	Merge `11738d1b8a` into `c677dd99d4`	2026-04-08 10:52:12 +07: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
Huy Z	11738d1b8a	Fix comment syntax in JetBrains gitignore Comments must have `#` starting the line. Inline `#`s would just prevent the ignore lines from working as intended.	2025-09-21 23:53:14 -07:00