resolve DS_Store conflict

This commit is contained in:
Umur Ozkul 2022-03-25 18:13:23 +01:00
parent 7dd8cd93a5
commit 2dab2f11f6

1
.gitignore vendored
View File

@ -3,4 +3,5 @@ yarn-error.log
.cache
.merlin
.parcel-cache
.DS_Store
**/.sync.ffs_db