Resolved merge conflict in .gitignore
This commit is contained in:
8
.gitignore
vendored
8
.gitignore
vendored
@@ -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
|
||||||
Reference in New Issue
Block a user