summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-09-16 16:24:20 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-09-16 16:24:20 +0200
commit9e36ef31f9bf16d43326fd047619ada5ff16e072 (patch)
treee228816adedacfed87eb08e8bc86658536cbbe86 /.gitignore
parent6a7ac3d9da3dea4130eb08a07a0a0603418d54ab (diff)
parent21728afff571adfc508cf5fa473d094946ef188f (diff)
merge
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore7
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 74778ee29..2eae6a664 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@
#specific to news app
-coffee/build/
node_modules/
*.log
/build/
-js/build/
+/js/coverage/
js/*.xml
.rvm
*.clover
@@ -34,7 +33,7 @@ RCS/*
.project
.settings
-# netbeans
+# netbeans
nbproject
# phpStorm
@@ -48,7 +47,7 @@ nbproject
# vim ex mode
.vimrc
-
+
# Mac OS
.DS_Store