summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMartin Hellmich <mhellmic@gmail.com>2013-04-22 23:24:38 +0200
committerMartin Hellmich <mhellmic@gmail.com>2013-04-22 23:24:38 +0200
commit89bceb2821d82c64434e6529de48ec7d7389a13e (patch)
tree28378bbd407cae78abbff2a1fc86349db9d58c0b /.gitignore
parent0c622b2e30333f26103a4440a888d440cf455c9c (diff)
parentbebecd33783b483f6af059e311b9631d3a3336cc (diff)
Merge branch 'master' of git://github.com/puppetlabs/puppetlabs-stdlib
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index caf0c24..2e3ca63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ pkg/
.DS_Store
metadata.json
coverage/
-vendor/
-.bundle/
+spec/fixtures/
Gemfile.lock
+.bundle/
+vendor/bundle/