Update .gitignore

Update Gitignore
Obsidian-TTRPG-Community · May 12, 2023 · 34aad63 · 34aad63
1 parent ee79c6f
commit 34aad63
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,12 @@
 # IDE and Obsidian
 
 /.obsidian/
+<<<<<<< Updated upstream
 /.vscode/
 /.idea/
 /.trash/
+=======
+.vscode
+.trash
+/.idea/
+>>>>>>> Stashed changes