aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorvlatka pavisic2016-11-09 15:10:29 +0100
committervlatka pavisic2016-11-09 15:10:29 +0100
commit21c6807d2167ffdbcaed58844d1ebafb06c22d6e (patch)
treed4f0bca5b97266f08a956de2b946a1bf79a3e964 /.gitignore
parent56c0f55d2d8d566b931664b85c76dbe3a58e31cc (diff)
parent0dbc80d54b1362c9eb0fc87d8d93f3d60ade68e1 (diff)
downloadchouette-core-21c6807d2167ffdbcaed58844d1ebafb06c22d6e.tar.bz2
Refs #1872 : Fix conflicts
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b6a61fd27..762c156eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@ coverage
.idea
bin/
+# Ignore node modules
+/node_modules