summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-11-04 14:39:23 +0100
committervarac <varacanero@zeromail.org>2016-11-04 14:39:23 +0100
commit5d001efb65f4ac2afa39d17b7b62d4f861f450a3 (patch)
tree88b282297150f4890fce19182206dc9bfa0f3a9d /.gitignore
parent33c61e8df59db1abbed379a9e9790946060a8f1e (diff)
parent584b7aad338206026d62d846122e6bef532a2d2a (diff)
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index a54aa97..ad8ff1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,8 @@
/pkg/
/Gemfile.lock
/vendor/
-/spec/fixtures/manifests/*
-/spec/fixtures/modules/*
-!/spec/fixtures/modules/apt
-!/spec/fixtures/modules/apt/*
+/spec/fixtures
+/log
/.vagrant/
/.bundle/
/coverage/