fixed merge conflict

[u/erikhf/frm.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6fa37ac748bb098a47c5e77d995ab3ecc6a38b23..ba209168f9bc38fa35f7ebaef0c1c62c4d0185dd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-/.idea
-/frm.iml
+.idea/
+node_modules/
+*.zip