resolve DS_Store conflict
This commit is contained in:
parent
7dd8cd93a5
commit
2dab2f11f6
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -3,4 +3,5 @@ yarn-error.log
|
||||||
.cache
|
.cache
|
||||||
.merlin
|
.merlin
|
||||||
.parcel-cache
|
.parcel-cache
|
||||||
|
.DS_Store
|
||||||
**/.sync.ffs_db
|
**/.sync.ffs_db
|
||||||
|
|
Loading…
Reference in New Issue
Block a user