Resolved merge conflict in .gitignore

This commit is contained in:
2025-02-13 00:41:37 +05:30

10
.gitignore vendored
View File

@@ -37,5 +37,11 @@ DerivedDataCache/
Build/*/** Build/*/**
!Build/*/PakBlacklist*.txt !Build/*/PakBlacklist*.txt
# Other project specific ignores # OS generated files
.DS_Store .DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db