Merge branch 'server' into 'main'

[rbdr/junction] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2d2b47d1bdb912c2f325d6d7d3680cb3ad7d5c9b..9765d1ce39ab3d6c06f5819bffb164edcd7bdab4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .idea
 .idea

-node_modules
\ No newline at end of file
+node_modules
+.DS_Store