Merge branch 'server' into 'main'

[rbdr/junction] / .gitignore

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

 node_modules
 node_modules

+.DS_Store