From 2dab2f11f6bca0938d5a9ce7703216b87e53f04a Mon Sep 17 00:00:00 2001
From: Umur Ozkul <umur@hightechmind.io>
Date: Fri, 25 Mar 2022 18:13:23 +0100
Subject: [PATCH] resolve DS_Store conflict

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index cc8cdd80..aa5c0ae1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ yarn-error.log
 .cache
 .merlin
 .parcel-cache
+.DS_Store
 **/.sync.ffs_db