fixed merge conflict

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

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