From bd8afabce3dc117bcc50af32b0952a4212d41942 Mon Sep 17 00:00:00 2001
From: Trashman247 <rnwong@scu.edu>
Date: Fri, 30 Jun 2023 00:03:46 -0700
Subject: [PATCH] Resolve .git-ignore file conflict

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 2a4cd8f419..247d590e6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,5 +93,8 @@ src/blenderbim/layouts
 src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper.so
 src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 
+# apple
+.DS_Store
+
 # Brickschema
 src/blenderbim/blenderbim/bim/schema/Brick.ttl
\ No newline at end of file