summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorgebele <gebele@in-silico.ch>2016-12-07 06:39:44 +0000
committergebele <gebele@in-silico.ch>2016-12-07 06:39:44 +0000
commitb65956f3b250b4f10fe93b7d35924d21538cd6f5 (patch)
tree58e8fd19be86345682d46b18a40175b0ebf21708 /.gitignore
parent725b6d27302ebacda9ff2900b4c55bdbf1a73d06 (diff)
parent437b78faf4bcd820ea3193da18abf6b71eda8153 (diff)
merge fix
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index a0459cb..49b161f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
Gemfile.lock
.sass-cache/
-tmp/*