docs: fixed merge conflict

spectrocloud · Jul 26, 2023 · 734d1fb · 734d1fb
1 parent f495aa0
commit 734d1fb
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ variables.env.old
 config.yaml
 content-*/*
 .arg
+.DS_Store