From 734d1fb544f74b90ede250febe3d972219697031 Mon Sep 17 00:00:00 2001
From: Karl Cardenas <karl@spectrocloud.com>
Date: Wed, 26 Jul 2023 15:18:19 -0700
Subject: [PATCH] docs: fixed merge conflict

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

diff --git a/.gitignore b/.gitignore
index f0d1dbb..067ee2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ variables.env.old
 config.yaml
 content-*/*
 .arg
+.DS_Store
\ No newline at end of file